Remove unneeded uses of logging.h in header files.

Review URL: http://codereview.chromium.org/43148

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11590 0039d316-1c4b-4281-b951-d872f2087c98

base/condition_variable.h

@@ -66,7 +66,6 @@
 #define BASE_CONDITION_VARIABLE_H_
 
 #include "base/lock.h"
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 

base/non_thread_safe.cc

@@ -4,11 +4,11 @@
 
 #include "base/non_thread_safe.h"
 
-#include "base/platform_thread.h"
-
 // These checks are only done in debug builds.
 #ifndef NDEBUG
 
+#include "base/logging.h"
+
 NonThreadSafe::NonThreadSafe()
     : valid_thread_id_(PlatformThread::CurrentId()) {
 }

base/non_thread_safe.h

@@ -5,7 +5,6 @@
 #ifndef BASE_NON_THREAD_SAFE_H__
 #define BASE_NON_THREAD_SAFE_H__
 
-#include "base/logging.h"
 #include "base/platform_thread.h"
 
 // A helper class used to help verify that methods of a class are

base/task.h

@@ -5,7 +5,6 @@
 #ifndef BASE_TASK_H_
 #define BASE_TASK_H_
 
-#include "base/logging.h"
 #include "base/non_thread_safe.h"
 #include "base/revocable_store.h"
 #include "base/tracked.h"

base/test_file_util_win.cc

@@ -10,6 +10,7 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/logging.h"
 #include "base/scoped_handle.h"
 
 namespace file_util {

base/timer.h

@@ -46,6 +46,7 @@
 // because they're flaky on the buildbot, but when you run them locally you
 // should be able to tell the difference.
 
+#include "base/logging.h"
 #include "base/task.h"
 #include "base/time.h"
 

base/watchdog.h

@@ -22,6 +22,7 @@
 
 #include "base/condition_variable.h"
 #include "base/lock.h"
+#include "base/logging.h"
 #include "base/platform_thread.h"
 #include "base/time.h"
 

base/worker_pool_linux.cc

@@ -4,6 +4,7 @@
 
 #include "base/worker_pool.h"
 
+#include "base/logging.h"
 #include "base/task.h"
 
 namespace {

base/worker_pool_win.cc

@@ -4,6 +4,7 @@
 
 #include "base/worker_pool.h"
 
+#include "base/logging.h"
 #include "base/task.h"
 
 namespace {

chrome/browser/chrome_thread.h

@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_CHROME_THREAD_H__
 
 #include "base/lock.h"
-#include "base/logging.h"
 #include "base/thread.h"
 
 ///////////////////////////////////////////////////////////////////////////////

chrome/browser/download/download_exe.cc

@@ -7,6 +7,8 @@
 
 #include "chrome/browser/download/download_util.h"
 
+#include "base/logging.h"
+
 namespace download_util {
 
 // For file extensions taken from mozilla:

chrome/browser/icon_loader.h

@@ -5,10 +5,11 @@
 #ifndef CHROME_BROWSER_ICON_LOADER_H__
 #define CHROME_BROWSER_ICON_LOADER_H__
 
-#include "base/logging.h"
 #include <string>
 #include <windows.h>
 
+#include "base/basictypes.h"
+
 namespace {
 class IconLoaderProcessor;
 }

chrome/browser/net/dns_host_info.h

@@ -13,7 +13,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 

chrome/browser/net/url_fetcher_protect.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/net/url_fetcher_protect.h"
 
+#include "base/logging.h"
+
 // URLFetcherProtectEntry ----------------------------------------------------
 
 using base::TimeDelta;

chrome/browser/net/url_fetcher_protect.h

@@ -13,7 +13,6 @@
 #include <string>
 
 #include "base/lock.h"
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 

chrome/browser/safe_browsing/safe_browsing_blocking_page.h

@@ -31,7 +31,6 @@
 #include <map>
 #include <vector>
 
-#include "base/logging.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "googleurl/src/gurl.h"

chrome/browser/ssl/ssl_error_info.h

@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
 #include "net/base/x509_certificate.h"
 
 class GURL;

chrome/browser/ssl/ssl_host_state.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ssl/ssl_host_state.h"
 
+#include "base/logging.h"
+
 SSLHostState::SSLHostState() {
 }
 

chrome/browser/views/hung_renderer_view.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_HUNG_RENDERER_VIEW_H__
 #define CHROME_BROWSER_VIEWS_HUNG_RENDERER_VIEW_H__
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 
 class HungRendererWarningView;
 namespace views {

chrome/browser/views/keyword_editor_view.h

@@ -8,7 +8,6 @@
 #include <Windows.h>
 #include <map>
 
-#include "base/logging.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/views/dialog_delegate.h"
 #include "chrome/views/native_button.h"

chrome/browser/window_sizer.h

@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_WINDOW_SIZER_H__
 #define CHROME_BROWSER_WINDOW_SIZER_H__
 
+#include "base/basictypes.h"
 #include "base/gfx/rect.h"
-#include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 ///////////////////////////////////////////////////////////////////////////////

chrome/browser/window_sizer_unittest.cc

@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "chrome/browser/window_sizer.h"
+#include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Some standard monitor sizes (no task bar).

chrome/common/chrome_plugin_util.h

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_CHROME_PLUGIN_UTIL_H__
-#define CHROME_COMMON_CHROME_PLUGIN_UTIL_H__
+#ifndef CHROME_COMMON_CHROME_PLUGIN_UTIL_H_
+#define CHROME_COMMON_CHROME_PLUGIN_UTIL_H_
+
+#include <string>
 
 #include "base/basictypes.h"
 #include "base/non_thread_safe.h"
@@ -51,7 +53,7 @@ class PluginHelper : public NotificationObserver, public NonThreadSafe {
  protected:
   scoped_refptr<ChromePluginLib> plugin_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PluginHelper);
+  DISALLOW_COPY_AND_ASSIGN(PluginHelper);
 };
 
 // A class of utility functions for dealing with request responses.
@@ -80,4 +82,4 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url,
 void* STDCALL CPB_Alloc(uint32 size);
 void STDCALL CPB_Free(void* memory);
 
-#endif  // CHROME_COMMON_CHROME_PLUGIN_UTIL_H__
+#endif  // CHROME_COMMON_CHROME_PLUGIN_UTIL_H_

chrome/test/testing_browser_process.h

@@ -18,7 +18,6 @@
 #include "base/waitable_event.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/notification_service.h"
-#include "base/logging.h"
 
 class TestingBrowserProcess : public BrowserProcess {
  public:

net/base/file_stream.h

@@ -12,6 +12,7 @@
 
 #include "base/file_path.h"
 #include "base/platform_file.h"
+#include "base/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 
 namespace net {

net/base/listen_socket_unittest.h

@@ -18,7 +18,6 @@
 
 #include "base/thread.h"
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"

net/disk_cache/mapped_file_posix.cc

@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 
+#include "base/logging.h"
 #include "net/disk_cache/disk_cache.h"
 
 namespace disk_cache {

net/disk_cache/mapped_file_win.cc

@@ -4,6 +4,7 @@
 
 #include "net/disk_cache/mapped_file.h"
 
+#include "base/logging.h"
 #include "net/disk_cache/disk_cache.h"
 
 namespace disk_cache {

net/disk_cache/mem_backend_impl.cc

@@ -4,6 +4,7 @@
 
 #include "net/disk_cache/mem_backend_impl.h"
 
+#include "base/logging.h"
 #include "base/sys_info.h"
 #include "net/disk_cache/cache_util.h"
 #include "net/disk_cache/mem_entry_impl.h"

net/disk_cache/mem_entry_impl.cc

@@ -4,6 +4,7 @@
 
 #include "net/disk_cache/mem_entry_impl.h"
 
+#include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/mem_backend_impl.h"

net/ftp/ftp_network_transaction.cc

@@ -5,6 +5,7 @@
 #include "net/ftp/ftp_network_transaction.h"
 
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "net/base/client_socket.h"
 #include "net/base/net_errors.h"
 #include "net/ftp/ftp_network_session.h"

net/http/http_cache.h

@@ -19,6 +19,7 @@
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
+#include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "net/http/http_transaction_factory.h"
 

sandbox/src/sandbox_policy_base.cc

@@ -5,6 +5,7 @@
 #include "sandbox/src/sandbox_policy_base.h"
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "sandbox/src/filesystem_dispatcher.h"
 #include "sandbox/src/filesystem_policy.h"
 #include "sandbox/src/job.h"

sandbox/src/sandbox_policy_base.h

@@ -9,7 +9,6 @@
 #include <list>
 
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "sandbox/src/ipc_tags.h"
 #include "sandbox/src/sandbox_policy.h"
 #include "sandbox/src/win_utils.h"

tools/memory_watcher/hotkey.h

@@ -7,7 +7,6 @@
 
 #include <atlbase.h>
 #include <atlwin.h>
-#include "base/logging.h"
 
 // HotKey handler.
 // Programs wishing to register a hotkey can use this.

tools/memory_watcher/memory_watcher.h

@@ -14,7 +14,6 @@
 #include <map>
 #include <functional>
 #include "base/lock.h"
-#include "base/logging.h"
 #include "tools/memory_watcher/memory_hook.h"
 
 class CallStack;

webkit/default_plugin/plugin_impl_mac.h

@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
 #include "third_party/npapi/bindings/npapi.h"
 // #include "webkit/default_plugin/install_dialog.h"
 // #include "webkit/default_plugin/plugin_database_handler.h"

webkit/default_plugin/plugin_impl_win.h

@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "webkit/default_plugin/install_dialog.h"
 #include "webkit/default_plugin/plugin_database_handler.h"

webkit/glue/chrome_client_impl.cc

@@ -28,6 +28,7 @@ MSVC_POP_WARNING();
 
 #include "webkit/glue/chrome_client_impl.h"
 
+#include "base/logging.h"
 #include "base/gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/glue_util.h"

webkit/glue/cpp_bound_class.cc

@@ -15,6 +15,7 @@
 #include "config.h"
 
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 
 #include "webkit/glue/cpp_bound_class.h"
 #include "webkit/glue/webframe.h"

webkit/glue/cpp_bound_class.h

@@ -23,6 +23,7 @@
 
 #include "webkit/glue/cpp_variant.h"
 
+#include "base/scoped_ptr.h"
 #include "base/task.h"
 
 class WebFrame;

webkit/glue/glue_accessibility.cc

@@ -16,6 +16,7 @@
 
 #include "webkit/glue/glue_accessibility.h"
 
+#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webview_impl.h"

webkit/glue/inspector_client_impl.cc

@@ -15,6 +15,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 MSVC_POP_WARNING();
 
 #undef LOG
+#include "base/logging.h"
 #include "base/gfx/rect.h"
 #include "webkit/glue/inspector_client_impl.h"
 #include "webkit/glue/webkit_glue.h"