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
marcosholgado · Aug 27, 2010 · 1407b6e · 1407b6e
1 parent 396850c
commit 1407b6e
Show file tree

Hide file tree

Showing 81 changed files with 125 additions and 139 deletions.
diff --git 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
@@ -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
@@ -1,13 +1,13 @@
-// 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.
 
 #include "app/resource_bundle.h"
 
 #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
@@ -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
@@ -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
@@ -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
@@ -1,13 +1,13 @@
-// 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.
 
 #include "base/file_version_info_mac.h"
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -77,4 +77,4 @@ struct StackHelper {
   WORD count_;
 };
 
-#endif  // CHROME_FRAME_CRASH_REPORTING_VEH_TEST_H_
+#endif  // CHROME_FRAME_CRASH_REPORTING_VEH_TEST_H_
diff --git 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
@@ -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
@@ -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
@@ -1392,4 +1392,3 @@ bool CanNavigate(const GURL& url, IInternetSecurityManager* security_manager,
 
   return true;
 }
-
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1392,4 +1392,3 @@ bool CanNavigate(const GURL& url, IInternetSecurityManager* security_manager,

		return true;
		}