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

43 files changed, 37 insertions, 25 deletions

diff --git a/base/condition_variable.h b/base/condition_variable.h
index 5ee7f74..c292f3d 100644
--- a/base/condition_variable.h
+++ b/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"
 
diff --git a/base/non_thread_safe.cc b/base/non_thread_safe.cc
index 1163742..d8a91c6 100644
--- a/base/non_thread_safe.cc
+++ b/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()) {
 }
diff --git a/base/non_thread_safe.h b/base/non_thread_safe.h
index e85a554..1da46aa 100644
--- a/base/non_thread_safe.h
+++ b/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
diff --git a/base/task.h b/base/task.h
index 0aeea17..36bd43f 100644
--- a/base/task.h
+++ b/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"
diff --git a/base/test_file_util_win.cc b/base/test_file_util_win.cc
index 705fba8..f6a5bec 100644
--- a/base/test_file_util_win.cc
+++ b/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 {
diff --git a/base/timer.h b/base/timer.h
index 08c851f..887c2c3 100644
--- a/base/timer.h
+++ b/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"
 
diff --git a/base/watchdog.h b/base/watchdog.h
index 361d053..59ee80c 100644
--- a/base/watchdog.h
+++ b/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"
 
diff --git a/base/worker_pool_linux.cc b/base/worker_pool_linux.cc
index fce8861..95023f7 100644
--- a/base/worker_pool_linux.cc
+++ b/base/worker_pool_linux.cc
@@ -4,6 +4,7 @@
 
 #include "base/worker_pool.h"
 
+#include "base/logging.h"
 #include "base/task.h"
 
 namespace {
diff --git a/base/worker_pool_win.cc b/base/worker_pool_win.cc
index 4bf0947..3f383b9 100644
--- a/base/worker_pool_win.cc
+++ b/base/worker_pool_win.cc
@@ -4,6 +4,7 @@
 
 #include "base/worker_pool.h"
 
+#include "base/logging.h"
 #include "base/task.h"
 
 namespace {
diff --git a/chrome/browser/chrome_thread.h b/chrome/browser/chrome_thread.h
index 305af03..53fa50b 100644
--- a/chrome/browser/chrome_thread.h
+++ b/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"
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/download/download_exe.cc b/chrome/browser/download/download_exe.cc
index 059fab8..994f5f0 100644
--- a/chrome/browser/download/download_exe.cc
+++ b/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:
diff --git a/chrome/browser/icon_loader.h b/chrome/browser/icon_loader.h
index 0c59848..3505aae 100644
--- a/chrome/browser/icon_loader.h
+++ b/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;
 }
diff --git a/chrome/browser/net/dns_host_info.h b/chrome/browser/net/dns_host_info.h
index b9ea157..64681056 100644
--- a/chrome/browser/net/dns_host_info.h
+++ b/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"
 
diff --git a/chrome/browser/net/url_fetcher_protect.cc b/chrome/browser/net/url_fetcher_protect.cc
index 5b7b208..22292ab 100644
--- a/chrome/browser/net/url_fetcher_protect.cc
+++ b/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;
diff --git a/chrome/browser/net/url_fetcher_protect.h b/chrome/browser/net/url_fetcher_protect.h
index 794418b..7352932 100644
--- a/chrome/browser/net/url_fetcher_protect.h
+++ b/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"
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
index 8e3d1fd..242f68f 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
+++ b/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"
diff --git a/chrome/browser/ssl/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h
index 93f60df..d11fc0d 100644
--- a/chrome/browser/ssl/ssl_error_info.h
+++ b/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;
diff --git a/chrome/browser/ssl/ssl_host_state.cc b/chrome/browser/ssl/ssl_host_state.cc
index 5bee7d9..1fdf200 100755
--- a/chrome/browser/ssl/ssl_host_state.cc
+++ b/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() {
 }
 
diff --git a/chrome/browser/views/hung_renderer_view.h b/chrome/browser/views/hung_renderer_view.h
index bf60962..0b26e90 100644
--- a/chrome/browser/views/hung_renderer_view.h
+++ b/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 {
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index 8d475e7..a576430 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/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"
diff --git a/chrome/browser/window_sizer.h b/chrome/browser/window_sizer.h
index abc5115..d7d1c24 100644
--- a/chrome/browser/window_sizer.h
+++ b/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"
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/window_sizer_unittest.cc b/chrome/browser/window_sizer_unittest.cc
index 3769d63..d49ea89 100644
--- a/chrome/browser/window_sizer_unittest.cc
+++ b/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).
diff --git a/chrome/common/chrome_plugin_util.h b/chrome/common/chrome_plugin_util.h
index b7d7b96..d587ef1 100644
--- a/chrome/common/chrome_plugin_util.h
+++ b/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_
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 922fa82..0cbe91b 100644
--- a/chrome/test/testing_browser_process.h
+++ b/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:
diff --git a/net/base/file_stream.h b/net/base/file_stream.h
index 470c3c6..807ea55 100644
--- a/net/base/file_stream.h
+++ b/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 {
diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h
index 1272bb1..f9a9e0e 100644
--- a/net/base/listen_socket_unittest.h
+++ b/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"
diff --git a/net/disk_cache/mapped_file_posix.cc b/net/disk_cache/mapped_file_posix.cc
index a170f35..9f69c4c 100644
--- a/net/disk_cache/mapped_file_posix.cc
+++ b/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 {
diff --git a/net/disk_cache/mapped_file_win.cc b/net/disk_cache/mapped_file_win.cc
index c02711c..f573a93 100644
--- a/net/disk_cache/mapped_file_win.cc
+++ b/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 {
diff --git a/net/disk_cache/mem_backend_impl.cc b/net/disk_cache/mem_backend_impl.cc
index 660066b..0b8802a 100644
--- a/net/disk_cache/mem_backend_impl.cc
+++ b/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"
diff --git a/net/disk_cache/mem_entry_impl.cc b/net/disk_cache/mem_entry_impl.cc
index e3b078f..77e1b32 100644
--- a/net/disk_cache/mem_entry_impl.cc
+++ b/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"
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index f40a28d..3ace779 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/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"
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 03b8a83..297c8d5 100644
--- a/net/http/http_cache.h
+++ b/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"
 
diff --git a/sandbox/src/sandbox_policy_base.cc b/sandbox/src/sandbox_policy_base.cc
index 7566c0a..95afe43 100644
--- a/sandbox/src/sandbox_policy_base.cc
+++ b/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"
diff --git a/sandbox/src/sandbox_policy_base.h b/sandbox/src/sandbox_policy_base.h
index f4078db..5b34272 100644
--- a/sandbox/src/sandbox_policy_base.h
+++ b/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"
diff --git a/tools/memory_watcher/hotkey.h b/tools/memory_watcher/hotkey.h
index c7b44e7..c8b1ef6 100644
--- a/tools/memory_watcher/hotkey.h
+++ b/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.
diff --git a/tools/memory_watcher/memory_watcher.h b/tools/memory_watcher/memory_watcher.h
index 62f51d8..c382cb1 100644
--- a/tools/memory_watcher/memory_watcher.h
+++ b/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;
diff --git a/webkit/default_plugin/plugin_impl_mac.h b/webkit/default_plugin/plugin_impl_mac.h
index 45a785e..bd9cd77 100644
--- a/webkit/default_plugin/plugin_impl_mac.h
+++ b/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"
diff --git a/webkit/default_plugin/plugin_impl_win.h b/webkit/default_plugin/plugin_impl_win.h
index 7b396a6..8737ce5 100644
--- a/webkit/default_plugin/plugin_impl_win.h
+++ b/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"
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 91af605..ddb1926 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/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"
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc
index ea06dd2..151f070 100644
--- a/webkit/glue/cpp_bound_class.cc
+++ b/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"
diff --git a/webkit/glue/cpp_bound_class.h b/webkit/glue/cpp_bound_class.h
index b828107..7b1b9b8 100644
--- a/webkit/glue/cpp_bound_class.h
+++ b/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;
diff --git a/webkit/glue/glue_accessibility.cc b/webkit/glue/glue_accessibility.cc
index cd9cfd6..c49d15b 100644
--- a/webkit/glue/glue_accessibility.cc
+++ b/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"
diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index 6684a72..de44d45 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/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"