FBTF: Remove unneeded headers from base/ (part 7)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3176026

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

81 files changed, 125 insertions, 139 deletions

diff --git a/app/l10n_util.h b/app/l10n_util.h
index ec1da75..10dc0a1 100644
--- a/app/l10n_util.h
+++ b/app/l10n_util.h
@@ -17,7 +17,6 @@
 #include "build/build_config.h"
 
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index 55bf2ad..18d994f7 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,6 @@
 
 #include "app/app_paths.h"
 #include "base/base_paths.h"
-#include "base/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm
index 1388932..27f0f0d 100644
--- a/app/resource_bundle_mac.mm
+++ b/app/resource_bundle_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
diff --git a/base/crypto/cssm_init.h b/base/crypto/cssm_init.h
index a066542..e457083 100644
--- a/base/crypto/cssm_init.h
+++ b/base/crypto/cssm_init.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,6 @@
 
 #include <Security/cssm.h>
 
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 
 class Lock;
diff --git a/base/file_util_mac.mm b/base/file_util_mac.mm
index 7f81e8a..811799c 100644
--- a/base/file_util_mac.mm
+++ b/base/file_util_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,8 +7,8 @@
 #import <Cocoa/Cocoa.h>
 #include <copyfile.h>
 
+#include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/logging.h"
 #include "base/string_util.h"
 
 namespace file_util {
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index f8eb38d..26eb42d 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -18,7 +18,6 @@
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/logging.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/scoped_handle.h"
diff --git a/base/file_version_info_mac.mm b/base/file_version_info_mac.mm
index 2218226..57be79a 100644
--- a/base/file_version_info_mac.mm
+++ b/base/file_version_info_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 
diff --git a/base/lock_impl_win.cc b/base/lock_impl_win.cc
index 14b76f8..8c03b61 100644
--- a/base/lock_impl_win.cc
+++ b/base/lock_impl_win.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/lock_impl.h"
-#include "base/logging.h"
 
 LockImpl::LockImpl() {
   // The second parameter is the spin count, for short-held locks it avoid the
@@ -29,4 +28,3 @@ void LockImpl::Lock() {
 void LockImpl::Unlock() {
   ::LeaveCriticalSection(&os_lock_);
 }
-
diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc
index cb9a84f3..72d2fbf 100644
--- a/base/message_pump_glib_unittest.cc
+++ b/base/message_pump_glib_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,7 +10,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/platform_thread.h"
 #include "base/ref_counted.h"
diff --git a/base/scoped_variant_win.h b/base/scoped_variant_win.h
index df6703e..c712e50 100644
--- a/base/scoped_variant_win.h
+++ b/base/scoped_variant_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,8 +9,8 @@
 #include <windows.h>
 #include <oleauto.h>
 
-#include "base/basictypes.h"  // needed to pick up OS_WIN
-#include "base/logging.h"
+#include "base/basictypes.h"
+#include "build/build_config.h"
 
 // Scoped VARIANT class for automatically freeing a COM VARIANT at the
 // end of a scope.  Additionally provides a few functions to make the
diff --git a/base/scoped_vector.h b/base/scoped_vector.h
index b797078..34620e6 100644
--- a/base/scoped_vector.h
+++ b/base/scoped_vector.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "base/stl_util-inl.h"
 
 // ScopedVector wraps a vector deleting the elements from its
diff --git a/chrome_frame/chrome_frame_histograms.cc b/chrome_frame/chrome_frame_histograms.cc
index f7592e4..3dac19f 100644
--- a/chrome_frame/chrome_frame_histograms.cc
+++ b/chrome_frame/chrome_frame_histograms.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,6 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/pickle.h"
 
   // Initialize histogram statistics gathering system.
 base::LazyInstance<StatisticsRecorder>
diff --git a/chrome_frame/chrome_frame_reporting.cc b/chrome_frame/chrome_frame_reporting.cc
index 36d2d57..2d4b105 100644
--- a/chrome_frame/chrome_frame_reporting.cc
+++ b/chrome_frame/chrome_frame_reporting.cc
@@ -1,11 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implementation of wrapper around common crash reporting.
 
 #include "base/file_util.h"
-#include "base/logging.h"
 #include "base/file_version_info.h"
 #include "base/win_util.h"
 #include "chrome/installer/util/google_update_settings.h"
diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc
index 3d233ac..caa02c0 100644
--- a/chrome_frame/chrome_launcher_unittest.cc
+++ b/chrome_frame/chrome_launcher_unittest.cc
@@ -1,10 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
-#include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/chrome_launcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome_frame/crash_reporting/crash_report.h b/chrome_frame/crash_reporting/crash_report.h
index c3377f4..b8898bd 100644
--- a/chrome_frame/crash_reporting/crash_report.h
+++ b/chrome_frame/crash_reporting/crash_report.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,7 +9,6 @@
 
 #include <string>
 
-#include "base/logging.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 
 extern google_breakpad::ExceptionHandler* g_breakpad;
diff --git a/chrome_frame/crash_reporting/vectored_handler_unittest.cc b/chrome_frame/crash_reporting/vectored_handler_unittest.cc
index 4153646..7babde1 100644
--- a/chrome_frame/crash_reporting/vectored_handler_unittest.cc
+++ b/chrome_frame/crash_reporting/vectored_handler_unittest.cc
@@ -5,7 +5,6 @@
 #include <atlbase.h>
 
 #include "base/environment.h"
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/crash_reporting/crash_dll.h"
diff --git a/chrome_frame/crash_reporting/veh_test.h b/chrome_frame/crash_reporting/veh_test.h
index 3f9cd45..c69da73 100644
--- a/chrome_frame/crash_reporting/veh_test.h
+++ b/chrome_frame/crash_reporting/veh_test.h
@@ -77,4 +77,4 @@ struct StackHelper {
   WORD count_;
 };
 
-#endif  // CHROME_FRAME_CRASH_REPORTING_VEH_TEST_H_
\ No newline at end of file
+#endif  // CHROME_FRAME_CRASH_REPORTING_VEH_TEST_H_
diff --git a/chrome_frame/function_stub.h b/chrome_frame/function_stub.h
index 09cd909..ed294e7 100644
--- a/chrome_frame/function_stub.h
+++ b/chrome_frame/function_stub.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,7 +7,8 @@
 #define CHROME_FRAME_FUNCTION_STUB_H_
 
 #include <windows.h>
-#include "base/logging.h"
+
+#include "base/basictypes.h"
 
 // IMPORTANT: The struct below must be byte aligned.
 #pragma pack(push)
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.h b/chrome_frame/test/perf/chrome_frame_perftest.h
index 5b895f3..370ae5c 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.h
+++ b/chrome_frame/test/perf/chrome_frame_perftest.h
@@ -1,10 +1,9 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef CHROME_FRAME_TEST_PERF_CHROME_FRAME_PERFTEST_H_
 #define CHROME_FRAME_TEST_PERF_CHROME_FRAME_PERFTEST_H_
 #include <atlbase.h>
-#include "base/logging.h"
 #include "base/perftimer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -18,4 +17,3 @@ class SimpleModule : public CAtlExeModuleT<SimpleModule> {
   }
 };
 #endif  // CHROME_FRAME_TEST_PERF_CHROME_FRAME_PERFTEST_H_
-
diff --git a/chrome_frame/urlmon_upload_data_stream.h b/chrome_frame/urlmon_upload_data_stream.h
index 03316b7..8f715ed 100644
--- a/chrome_frame/urlmon_upload_data_stream.h
+++ b/chrome_frame/urlmon_upload_data_stream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,7 +9,6 @@
 #include <atlbase.h>
 #include <atlcom.h>
 
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "chrome_frame/stream_impl.h"
 #include "net/base/upload_data.h"
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index c2eade6..33d004f 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -1392,4 +1392,3 @@ bool CanNavigate(const GURL& url, IInternetSecurityManager* security_manager,
 
   return true;
 }
-
diff --git a/courgette/ensemble.cc b/courgette/ensemble.cc
index 4051cfc..69e07a7 100644
--- a/courgette/ensemble.cc
+++ b/courgette/ensemble.cc
@@ -1,11 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/ensemble.h"
 
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/string_number_conversions.h"
 
 #include "courgette/image_info.h"
diff --git a/courgette/ensemble_apply.cc b/courgette/ensemble_apply.cc
index 7ab6ff1..3643129 100644
--- a/courgette/ensemble_apply.cc
+++ b/courgette/ensemble_apply.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,6 @@
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
-#include "base/logging.h"
 
 #include "courgette/crc.h"
 #include "courgette/image_info.h"
diff --git a/gfx/native_widget_types_gtk.cc b/gfx/native_widget_types_gtk.cc
index 0813686..097af2b 100644
--- a/gfx/native_widget_types_gtk.cc
+++ b/gfx/native_widget_types_gtk.cc
@@ -1,10 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gfx/native_widget_types.h"
 
-#include "base/logging.h"
 #include "gfx/gtk_native_view_id_manager.h"
 
 namespace gfx {
diff --git a/gfx/platform_font_mac.mm b/gfx/platform_font_mac.mm
index 89616c5..1fb8316 100644
--- a/gfx/platform_font_mac.mm
+++ b/gfx/platform_font_mac.mm
@@ -6,7 +6,7 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "gfx/canvas_skia.h"
diff --git a/gfx/rect.cc b/gfx/rect.cc
index c081dea..1d9be1f 100644
--- a/gfx/rect.cc
+++ b/gfx/rect.cc
@@ -14,7 +14,6 @@
 
 #include <ostream>
 
-#include "base/logging.h"
 #include "gfx/insets.h"
 
 namespace {
diff --git a/gpu/command_buffer/service/framebuffer_manager.h b/gpu/command_buffer/service/framebuffer_manager.h
index 8e0ce40..175da42 100644
--- a/gpu/command_buffer/service/framebuffer_manager.h
+++ b/gpu/command_buffer/service/framebuffer_manager.h
@@ -7,7 +7,6 @@
 
 #include <map>
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
@@ -97,5 +96,3 @@ class FramebufferManager {
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
-
-
diff --git a/gpu/command_buffer/service/program_manager.h b/gpu/command_buffer/service/program_manager.h
index 66ff795..a10ba61 100644
--- a/gpu/command_buffer/service/program_manager.h
+++ b/gpu/command_buffer/service/program_manager.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/shader_manager.h"
@@ -230,4 +229,3 @@ class ProgramManager {
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
-
diff --git a/gpu/command_buffer/service/renderbuffer_manager.h b/gpu/command_buffer/service/renderbuffer_manager.h
index 1dc16c6..939ed3f 100644
--- a/gpu/command_buffer/service/renderbuffer_manager.h
+++ b/gpu/command_buffer/service/renderbuffer_manager.h
@@ -7,7 +7,6 @@
 
 #include <map>
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
@@ -106,5 +105,3 @@ class RenderbufferManager {
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_RENDERBUFFER_MANAGER_H_
-
-
diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h
index 9654d52..39eca59 100644
--- a/jingle/notifier/listener/mediator_thread_impl.h
+++ b/jingle/notifier/listener/mediator_thread_impl.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
diff --git a/jingle/notifier/listener/send_update_task_unittest.cc b/jingle/notifier/listener/send_update_task_unittest.cc
index 80a87aa..82d3a83 100644
--- a/jingle/notifier/listener/send_update_task_unittest.cc
+++ b/jingle/notifier/listener/send_update_task_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "jingle/notifier/listener/send_update_task.h"
 
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "jingle/notifier/listener/xml_element_util.h"
diff --git a/jingle/notifier/listener/subscribe_task_unittest.cc b/jingle/notifier/listener/subscribe_task_unittest.cc
index 3b44fd8..24cc106 100644
--- a/jingle/notifier/listener/subscribe_task_unittest.cc
+++ b/jingle/notifier/listener/subscribe_task_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "jingle/notifier/listener/subscribe_task.h"
 
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "jingle/notifier/listener/xml_element_util.h"
diff --git a/jingle/notifier/listener/talk_mediator_unittest.cc b/jingle/notifier/listener/talk_mediator_unittest.cc
index bd4dbdf..a138052 100644
--- a/jingle/notifier/listener/talk_mediator_unittest.cc
+++ b/jingle/notifier/listener/talk_mediator_unittest.cc
@@ -5,7 +5,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/message_loop.h"
 #include "jingle/notifier/listener/mediator_thread_mock.h"
 #include "jingle/notifier/listener/mediator_thread_impl.h"
diff --git a/jingle/notifier/listener/xml_element_util_unittest.cc b/jingle/notifier/listener/xml_element_util_unittest.cc
index 4566fe8..ee0849e 100644
--- a/jingle/notifier/listener/xml_element_util_unittest.cc
+++ b/jingle/notifier/listener/xml_element_util_unittest.cc
@@ -7,7 +7,6 @@
 #include <sstream>
 #include <string>
 
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index df96f4a..9383c9d 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/environment.h"
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/waitable_event.h"
 #include "media/audio/audio_output_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc
index f0aefe6..7d3a283 100644
--- a/media/audio/linux/alsa_output_unittest.cc
+++ b/media/audio/linux/alsa_output_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "media/audio/linux/alsa_output.h"
diff --git a/media/base/buffers.h b/media/base/buffers.h
index d03717d..438799b2 100644
--- a/media/base/buffers.h
+++ b/media/base/buffers.h
@@ -27,7 +27,7 @@
 #ifndef MEDIA_BASE_BUFFERS_H_
 #define MEDIA_BASE_BUFFERS_H_
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index e7da94e..b4fb5cf 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -4,6 +4,8 @@
 
 #include "media/base/video_frame.h"
 
+#include "base/logging.h"
+
 namespace media {
 
 // static
diff --git a/media/ffmpeg/file_protocol.cc b/media/ffmpeg/file_protocol.cc
index d70a3dc..f778319 100644
--- a/media/ffmpeg/file_protocol.cc
+++ b/media/ffmpeg/file_protocol.cc
@@ -16,7 +16,6 @@
 #include "base/compiler_specific.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_util.h"
-#include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 // warning C4996: 'open': The POSIX name for this item is deprecated.
diff --git a/media/filters/audio_renderer_algorithm_base.cc b/media/filters/audio_renderer_algorithm_base.cc
index 71ba5ce..5e4e2bbe 100644
--- a/media/filters/audio_renderer_algorithm_base.cc
+++ b/media/filters/audio_renderer_algorithm_base.cc
@@ -4,6 +4,7 @@
 
 #include "media/filters/audio_renderer_algorithm_base.h"
 
+#include "base/logging.h"
 #include "media/base/buffers.h"
 
 namespace media {
diff --git a/media/filters/audio_renderer_algorithm_ola.cc b/media/filters/audio_renderer_algorithm_ola.cc
index d393c59..2d47c91 100644
--- a/media/filters/audio_renderer_algorithm_ola.cc
+++ b/media/filters/audio_renderer_algorithm_ola.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <cmath>
 
+#include "base/logging.h"
 #include "media/base/buffers.h"
 
 namespace media {
diff --git a/media/filters/bitstream_converter.cc b/media/filters/bitstream_converter.cc
index 0818caf..45a19ab 100644
--- a/media/filters/bitstream_converter.cc
+++ b/media/filters/bitstream_converter.cc
@@ -4,6 +4,7 @@
 
 #include "media/filters/bitstream_converter.h"
 
+#include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 namespace media {
diff --git a/media/filters/bitstream_converter.h b/media/filters/bitstream_converter.h
index 7417209..4f6a0d7 100644
--- a/media/filters/bitstream_converter.h
+++ b/media/filters/bitstream_converter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -14,7 +14,6 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/logging.h"
 
 // FFmpeg types.
 struct AVBitStreamFilterContext;
diff --git a/media/filters/ffmpeg_video_allocator.cc b/media/filters/ffmpeg_video_allocator.cc
index 56aaa7c..63665f7 100644
--- a/media/filters/ffmpeg_video_allocator.cc
+++ b/media/filters/ffmpeg_video_allocator.cc
@@ -4,6 +4,7 @@
 
 #include "media/filters/ffmpeg_video_allocator.h"
 
+#include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 // Because Chromium could be build with FFMPEG version other than FFMPEG-MT
@@ -176,4 +177,3 @@ void FFmpegVideoAllocator::InternalReleaseBuffer(
 }
 
 } // namespace media
-
diff --git a/media/filters/ffmpeg_video_allocator.h b/media/filters/ffmpeg_video_allocator.h
index e2ff670..2cb1d742 100644
--- a/media/filters/ffmpeg_video_allocator.h
+++ b/media/filters/ffmpeg_video_allocator.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_ALLOCATOR_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_ALLOCATOR_H_
 
+#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "media/base/video_frame.h"
 #include "media/ffmpeg/ffmpeg_common.h"
diff --git a/net/base/dnssec_unittest.cc b/net/base/dnssec_unittest.cc
index 2a060d0..8e6f7d0 100644
--- a/net/base/dnssec_unittest.cc
+++ b/net/base/dnssec_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/logging.h"
 #include "net/base/dnssec_chain_verifier.h"
 #include "net/base/dnssec_keyset.h"
 #include "net/base/dns_util.h"
diff --git a/net/base/ssl_cipher_suite_names.cc b/net/base/ssl_cipher_suite_names.cc
index 0190a22..2db9a4b 100644
--- a/net/base/ssl_cipher_suite_names.cc
+++ b/net/base/ssl_cipher_suite_names.cc
@@ -6,7 +6,6 @@
 
 #include <stdlib.h>
 
-#include "base/logging.h"
 
 // Rather than storing the names of all the ciphersuites we eliminate the
 // redundancy and break each cipher suite into a key exchange method, cipher
diff --git a/net/base/upload_data.h b/net/base/upload_data.h
index ffb668a..ac80ceb 100644
--- a/net/base/upload_data.h
+++ b/net/base/upload_data.h
@@ -11,7 +11,6 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/file_stream.h"
diff --git a/net/http/http_auth_filter_unittest.cc b/net/http/http_auth_filter_unittest.cc
index f483342..c7f91f9 100644
--- a/net/http/http_auth_filter_unittest.cc
+++ b/net/http/http_auth_filter_unittest.cc
@@ -4,7 +4,6 @@
 
 #include <iostream>
 
-#include "base/logging.h"
 
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
diff --git a/net/http/http_auth_handler_ntlm_win.cc b/net/http/http_auth_handler_ntlm_win.cc
index 0f67c68..c1990d37 100644
--- a/net/http/http_auth_handler_ntlm_win.cc
+++ b/net/http/http_auth_handler_ntlm_win.cc
@@ -9,7 +9,6 @@
 
 #include "net/http/http_auth_handler_ntlm.h"
 
-#include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc
index 8ebc79e..02d8e3f 100644
--- a/net/proxy/proxy_bypass_rules.cc
+++ b/net/proxy/proxy_bypass_rules.cc
@@ -4,7 +4,6 @@
 
 #include "net/proxy/proxy_bypass_rules.h"
 
-#include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
index ac0dd74..63e3e6a 100644
--- a/net/socket/socks5_client_socket.h
+++ b/net/socket/socks5_client_socket.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
index af28574..3ac8f62 100644
--- a/net/socket/socks_client_socket.h
+++ b/net/socket/socks_client_socket.h
@@ -8,8 +8,8 @@
 
 #include <string>
 
+#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
diff --git a/net/spdy/spdy_frame_builder.h b/net/spdy/spdy_frame_builder.h
index e69add9..548cfda 100644
--- a/net/spdy/spdy_frame_builder.h
+++ b/net/spdy/spdy_frame_builder.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_SPDY_FRAME_BUILDER_H_
-#define NET_SPDY_FRAME_BUILDER_H_
+#ifndef NET_SPDY_SPDY_FRAME_BUILDER_H_
+#define NET_SPDY_SPDY_FRAME_BUILDER_H_
 #pragma once
 
 #ifdef WIN32
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "net/spdy/spdy_protocol.h"
 
 namespace spdy {
@@ -160,5 +160,4 @@ class SpdyFrameBuilder {
 
 }  // namespace spdy
 
-#endif  // NET_SPDY_FRAME_BUILDER_H_
-
+#endif  // NET_SPDY_SPDY_FRAME_BUILDER_H_
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index b35ff2f..e6d0e15 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -18,7 +18,6 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "net/spdy/spdy_protocol.h"
 
diff --git a/printing/printing_context.h b/printing/printing_context.h
index 8996fa9..9f915a1 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -15,7 +15,10 @@
 #include <string>
 
 #include "base/basictypes.h"
+#if !(defined(OS_WIN) || defined(OS_MACOSX))
+// TODO(port) Remove after implementing PrintingContext::context()
 #include "base/logging.h"
+#endif
 #include "base/scoped_ptr.h"
 #include "gfx/native_widget_types.h"
 #include "printing/print_settings.h"
diff --git a/remoting/base/encoder_verbatim.cc b/remoting/base/encoder_verbatim.cc
index d3821d7..d831006 100644
--- a/remoting/base/encoder_verbatim.cc
+++ b/remoting/base/encoder_verbatim.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/base/encoder_verbatim.h"
 
+#include "base/logging.h"
 #include "gfx/rect.h"
 #include "media/base/data_buffer.h"
 #include "remoting/base/capture_data.h"
diff --git a/remoting/base/encoder_zlib.cc b/remoting/base/encoder_zlib.cc
index fdf8725..05533a9 100644
--- a/remoting/base/encoder_zlib.cc
+++ b/remoting/base/encoder_zlib.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/base/encoder_zlib.h"
 
+#include "base/logging.h"
 #include "gfx/rect.h"
 #include "media/base/data_buffer.h"
 #include "remoting/base/capture_data.h"
diff --git a/remoting/base/protocol_decoder.cc b/remoting/base/protocol_decoder.cc
index 0dc8441..aa26e15 100644
--- a/remoting/base/protocol_decoder.cc
+++ b/remoting/base/protocol_decoder.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/base/protocol_decoder.h"
 
+#include "base/logging.h"
 #include "remoting/base/multiple_array_input_stream.h"
 #include "talk/base/byteorder.h"
 
diff --git a/remoting/base/protocol_util.cc b/remoting/base/protocol_util.cc
index 6532230d..f009eb3 100644
--- a/remoting/base/protocol_util.cc
+++ b/remoting/base/protocol_util.cc
@@ -6,6 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
+#include "base/logging.h"
 #include "talk/base/byteorder.h"
 
 namespace remoting {
diff --git a/remoting/client/client_util_unittest.cc b/remoting/client/client_util_unittest.cc
index b1c3d21..2c5a2ad 100644
--- a/remoting/client/client_util_unittest.cc
+++ b/remoting/client/client_util_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/client_util.h"
diff --git a/remoting/client/plugin/chromoting_plugin_unittest.cc b/remoting/client/plugin/chromoting_plugin_unittest.cc
index 2dc0358..30c6564 100644
--- a/remoting/client/plugin/chromoting_plugin_unittest.cc
+++ b/remoting/client/plugin/chromoting_plugin_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "remoting/client/plugin/chromoting_plugin.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/sandbox/src/service_resolver_32.cc b/sandbox/src/service_resolver_32.cc
index aaa2c49..01c2f0b 100644
--- a/sandbox/src/service_resolver_32.cc
+++ b/sandbox/src/service_resolver_32.cc
@@ -1,10 +1,9 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/src/service_resolver.h"
 
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "sandbox/src/sandbox_utils.h"
 #include "sandbox/src/win_utils.h"
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 756cc20..4c66b9f 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -6,7 +6,6 @@
 
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
-#include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 
 #if defined(OS_WIN)
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index f756171..59eed68 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #include "views/controls/combobox/native_combobox_gtk.h"
 
@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include "app/combobox_model.h"
-#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "views/controls/combobox/combobox.h"
 
diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc
index 76db003..c6f8185 100644
--- a/views/controls/listbox/native_listbox_win.cc
+++ b/views/controls/listbox/native_listbox_win.cc
@@ -9,7 +9,6 @@
 
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
-#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "views/controls/listbox/listbox.h"
diff --git a/views/controls/menu/menu_2.cc b/views/controls/menu/menu_2.cc
index cf12e2b..467572d 100644
--- a/views/controls/menu/menu_2.cc
+++ b/views/controls/menu/menu_2.cc
@@ -5,7 +5,6 @@
 #include "views/controls/menu/menu_2.h"
 
 #include "base/compiler_specific.h"
-#include "base/logging.h"
 #include "views/controls/menu/menu_wrapper.h"
 
 namespace views {
diff --git a/views/controls/native/native_view_host_gtk.h b/views/controls/native/native_view_host_gtk.h
index fe82160..11be9b5 100644
--- a/views/controls/native/native_view_host_gtk.h
+++ b/views/controls/native/native_view_host_gtk.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_NATIVE_HOST_VIEW_GTK_H_
-#define VIEWS_CONTROLS_NATIVE_HOST_VIEW_GTK_H_
+#ifndef VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_GTK_H_
+#define VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 #include <string>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "gfx/rect.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 
@@ -90,4 +90,4 @@ class NativeViewHostGtk : public NativeViewHostWrapper {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_NATIVE_HOST_VIEW_GTK_H_
+#endif  // VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_GTK_H_
diff --git a/views/controls/native/native_view_host_win.h b/views/controls/native/native_view_host_win.h
index 6546f1a..fb8d8be 100644
--- a/views/controls/native/native_view_host_win.h
+++ b/views/controls/native/native_view_host_win.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_HWND_VIEW_H_
-#define VIEWS_CONTROLS_HWND_VIEW_H_
+#ifndef VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WIN_H_
+#define VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WIN_H_
 #pragma once
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 
 namespace views {
@@ -44,4 +44,4 @@ class NativeViewHostWin : public NativeViewHostWrapper {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_HWND_VIEW_H_
+#endif  // VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WIN_H_
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 0b1c070..564243e 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -6,7 +6,9 @@
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #pragma once
 
-#if defined (OS_LINUX)
+#include "build/build_config.h"
+
+#if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
@@ -14,7 +16,9 @@
 
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
+#if !defined(OS_LINUX)
 #include "base/logging.h"
+#endif
 #include "base/string16.h"
 #include "gfx/font.h"
 #include "views/view.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 8657695..eba1a31 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -10,6 +10,7 @@
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
+#include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "gfx/canvas_skia.h"
@@ -603,6 +604,18 @@ void TreeView::RecursivelyDelete(NodeDetails* node) {
   delete node;
 }
 
+TreeView::NodeDetails* TreeView::GetNodeDetails(TreeModelNode* node) {
+  DCHECK(node &&
+         node_to_details_map_.find(node) != node_to_details_map_.end());
+  return node_to_details_map_[node];
+}
+
+// Returns the NodeDetails by identifier (lparam of the HTREEITEM).
+TreeView::NodeDetails* TreeView::GetNodeDetailsByID(int id) {
+  DCHECK(id_to_details_map_.find(id) != id_to_details_map_.end());
+  return id_to_details_map_[id];
+}
+
 TreeView::NodeDetails* TreeView::GetNodeDetailsByTreeItem(HTREEITEM tree_item) {
   DCHECK(tree_view_ && tree_item);
   TV_ITEM tv_item = {0};
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index c97149b..cbcfbe7 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -14,7 +14,6 @@
 #include "app/tree_model.h"
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
-#include "base/logging.h"
 #include "views/controls/native_control.h"
 
 namespace views {
@@ -243,17 +242,10 @@ class TreeView : public NativeControl, TreeModelObserver {
   void RecursivelyDelete(NodeDetails* node);
 
   // Returns the NodeDetails by node from the model.
-  NodeDetails* GetNodeDetails(TreeModelNode* node) {
-    DCHECK(node &&
-           node_to_details_map_.find(node) != node_to_details_map_.end());
-    return node_to_details_map_[node];
-  }
+  NodeDetails* GetNodeDetails(TreeModelNode* node);
 
   // Returns the NodeDetails by identifier (lparam of the HTREEITEM).
-  NodeDetails* GetNodeDetailsByID(int id) {
-    DCHECK(id_to_details_map_.find(id) != id_to_details_map_.end());
-    return id_to_details_map_[id];
-  }
+  NodeDetails* GetNodeDetailsByID(int id);
 
   // Returns the NodeDetails by HTREEITEM.
   NodeDetails* GetNodeDetailsByTreeItem(HTREEITEM tree_item);
diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc
index ab885d0..126513f 100644
--- a/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,6 @@
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
 #include "base/base_drag_source.h"
-#include "base/logging.h"
 #include "gfx/canvas_skia.h"
 
 namespace views {
diff --git a/webkit/glue/plugins/pepper_resource.cc b/webkit/glue/plugins/pepper_resource.cc
index c568183..b17fc31 100644
--- a/webkit/glue/plugins/pepper_resource.cc
+++ b/webkit/glue/plugins/pepper_resource.cc
@@ -4,6 +4,7 @@
 
 #include "webkit/glue/plugins/pepper_resource.h"
 
+#include "base/logging.h"
 #include "webkit/glue/plugins/pepper_resource_tracker.h"
 
 namespace pepper {
@@ -16,4 +17,10 @@ PP_Resource Resource::GetReference() {
     resource_id_ = tracker->AddResource(this);
   return resource_id_;
 }
+
+void Resource::StoppedTracking() {
+  DCHECK(resource_id_ != 0);
+  resource_id_ = 0;
+}
+
 }  // namespace pepper
diff --git a/webkit/glue/plugins/pepper_resource.h b/webkit/glue/plugins/pepper_resource.h
index b53b3ff..8c1e85c 100644
--- a/webkit/glue/plugins/pepper_resource.h
+++ b/webkit/glue/plugins/pepper_resource.h
@@ -5,7 +5,6 @@
 #ifndef WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_H_
 #define WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_H_
 
-#include "base/logging.h"
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "third_party/ppapi/c/pp_resource.h"
@@ -111,10 +110,7 @@ class Resource : public base::RefCountedThreadSafe<Resource> {
   // Called by the resource tracker when the last plugin reference has been
   // dropped.
   friend class ResourceTracker;
-  void StoppedTracking() {
-    DCHECK(resource_id_ != 0);
-    resource_id_ = 0;
-  }
+  void StoppedTracking();
 
   DISALLOW_COPY_AND_ASSIGN(Resource);
 };
diff --git a/webkit/glue/plugins/pepper_resource_tracker.h b/webkit/glue/plugins/pepper_resource_tracker.h
index bb6a697..1363dde 100644
--- a/webkit/glue/plugins/pepper_resource_tracker.h
+++ b/webkit/glue/plugins/pepper_resource_tracker.h
@@ -7,7 +7,6 @@
 
 #include <utility>
 
-#include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
diff --git a/webkit/support/weburl_loader_mock.cc b/webkit/support/weburl_loader_mock.cc
index 18f2387..b88e14c 100644
--- a/webkit/support/weburl_loader_mock.cc
+++ b/webkit/support/weburl_loader_mock.cc
@@ -4,6 +4,7 @@
 
 #include "webkit/support/weburl_loader_mock.h"
 
+#include "base/logging.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "webkit/support/weburl_loader_mock_factory.h"
diff --git a/webkit/support/weburl_loader_mock.h b/webkit/support/weburl_loader_mock.h
index d0a690f..db9d164 100644
--- a/webkit/support/weburl_loader_mock.h
+++ b/webkit/support/weburl_loader_mock.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_H_
 #define WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_H_
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h"
 
diff --git a/webkit/support/weburl_loader_mock_factory.cc b/webkit/support/weburl_loader_mock_factory.cc
index 4f553cf..86ae1c7 100644
--- a/webkit/support/weburl_loader_mock_factory.cc
+++ b/webkit/support/weburl_loader_mock_factory.cc
@@ -5,6 +5,7 @@
 #include "webkit/support/weburl_loader_mock_factory.h"
 
 #include "base/file_util.h"
+#include "base/logging.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
diff --git a/webkit/tools/test_shell/test_shell_devtools_callargs.cc b/webkit/tools/test_shell/test_shell_devtools_callargs.cc
index 7c8e8b2..bcdf4b5 100644
--- a/webkit/tools/test_shell/test_shell_devtools_callargs.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_callargs.cc
@@ -1,9 +1,27 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell_devtools_callargs.h"
 
+#include "base/logging.h"
+
 // static
 int TestShellDevToolsCallArgs::calls_count_ = 0;
 
+TestShellDevToolsCallArgs::TestShellDevToolsCallArgs(
+    const WebKit::WebString& data)
+    : data_(data) {
+  ++calls_count_;
+}
+
+TestShellDevToolsCallArgs::TestShellDevToolsCallArgs(
+    const TestShellDevToolsCallArgs& args)
+    : data_(args.data_) {
+  ++calls_count_;
+}
+
+TestShellDevToolsCallArgs::~TestShellDevToolsCallArgs() {
+  --calls_count_;
+  DCHECK(calls_count_ >= 0);
+}
diff --git a/webkit/tools/test_shell/test_shell_devtools_callargs.h b/webkit/tools/test_shell/test_shell_devtools_callargs.h
index 92106ec..7030861 100644
--- a/webkit/tools/test_shell/test_shell_devtools_callargs.h
+++ b/webkit/tools/test_shell/test_shell_devtools_callargs.h
@@ -1,30 +1,21 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TEST_SHELL_DEVTOOLS_CALLARGS_H_
-#define TEST_SHELL_DEVTOOLS_CALLARGS_H_
+#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_DEVTOOLS_CALLARGS_H_
+#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_DEVTOOLS_CALLARGS_H_
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
 class TestShellDevToolsCallArgs {
  public:
-  TestShellDevToolsCallArgs(const WebKit::WebString& data)
-      : data_(data) {
-    ++calls_count_;
-  }
+  explicit TestShellDevToolsCallArgs(const WebKit::WebString& data);
 
-  TestShellDevToolsCallArgs(const TestShellDevToolsCallArgs& args)
-      : data_(args.data_) {
-    ++calls_count_;
-  }
+  TestShellDevToolsCallArgs(const TestShellDevToolsCallArgs& args);
 
-  ~TestShellDevToolsCallArgs() {
-    --calls_count_;
-    DCHECK(calls_count_ >= 0);
-  }
+  ~TestShellDevToolsCallArgs();
 
   static int calls_count() { return calls_count_; }
 
@@ -34,4 +25,4 @@ class TestShellDevToolsCallArgs {
   static int calls_count_;
 };
 
-#endif  // TEST_SHELL_DEVTOOLS_CALLARGS_H_
+#endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_DEVTOOLS_CALLARGS_H_