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

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

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

36 files changed, 36 insertions, 43 deletions

diff --git a/app/clipboard/clipboard_win.cc b/app/clipboard/clipboard_win.cc
index 1a4d1c8..44dbb31 100644
--- a/app/clipboard/clipboard_win.cc
+++ b/app/clipboard/clipboard_win.cc
@@ -12,7 +12,6 @@
 
 #include "app/clipboard/clipboard_util_win.h"
 #include "base/file_path.h"
-#include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
@@ -127,7 +126,7 @@ HGLOBAL CreateGlobalData(const std::basic_string<charT>& str) {
   return data;
 };
 
-} // namespace
+}  // namespace
 
 Clipboard::Clipboard() : create_window_(false) {
   if (MessageLoop::current()->type() == MessageLoop::TYPE_UI) {
diff --git a/base/condition_variable_posix.cc b/base/condition_variable_posix.cc
index 9555be7..5d9ccb4 100644
--- a/base/condition_variable_posix.cc
+++ b/base/condition_variable_posix.cc
@@ -8,7 +8,6 @@
 #include <sys/time.h>
 
 #include "base/lock.h"
-#include "base/lock_impl.h"
 #include "base/logging.h"
 #include "base/time.h"
 
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 0d8ccbb..e0a1a55 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -33,7 +33,6 @@
 #include "base/basictypes.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
-#include "base/lock.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
@@ -864,4 +863,4 @@ bool CopyFile(const FilePath& from_path, const FilePath& to_path) {
 }
 #endif  // defined(OS_MACOSX)
 
-} // namespace file_util
+}  // namespace file_util
diff --git a/base/lock.h b/base/lock.h
index 0ae4861..ba34964 100644
--- a/base/lock.h
+++ b/base/lock.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/lock_impl.h"
+#include "base/platform_thread.h"
 
 // A convenient wrapper for an OS specific critical section.  The only real
 // intelligence in this class is in debug mode for the support for the
diff --git a/base/lock_impl.h b/base/lock_impl.h
index 9a6a1a0..6066495 100644
--- a/base/lock_impl.h
+++ b/base/lock_impl.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,6 @@
 #endif
 
 #include "base/basictypes.h"
-#include "base/platform_thread.h"
 
 // This class implements the underlying platform-specific spin-lock mechanism
 // used for the Lock class.  Most users should not use LockImpl directly, but
diff --git a/base/message_pump_win.h b/base/message_pump_win.h
index d57fe1d..ea7dd39 100644
--- a/base/message_pump_win.h
+++ b/base/message_pump_win.h
@@ -11,7 +11,6 @@
 #include <list>
 
 #include "base/basictypes.h"
-#include "base/lock.h"
 #include "base/message_pump.h"
 #include "base/observer_list.h"
 #include "base/scoped_handle.h"
diff --git a/base/simple_thread_unittest.cc b/base/simple_thread_unittest.cc
index 85995c2..208290a 100644
--- a/base/simple_thread_unittest.cc
+++ b/base/simple_thread_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/atomic_sequence_num.h"
-#include "base/lock.h"
 #include "base/simple_thread.h"
 #include "base/string_number_conversions.h"
 #include "base/waitable_event.h"
diff --git a/base/singleton.h b/base/singleton.h
index 7caa8ee..8435c43 100644
--- a/base/singleton.h
+++ b/base/singleton.h
@@ -8,6 +8,7 @@
 
 #include "base/at_exit.h"
 #include "base/atomicops.h"
+#include "base/platform_thread.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/thread_restrictions.h"
 
diff --git a/base/thread_unittest.cc b/base/thread_unittest.cc
index 1651a6a..6b72b83 100644
--- a/base/thread_unittest.cc
+++ b/base/thread_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/tracked_objects.h b/base/tracked_objects.h
index 87912c0..8590a8c 100644
--- a/base/tracked_objects.h
+++ b/base/tracked_objects.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/lock.h"
-#include "base/task.h"
 #include "base/thread_local_storage.h"
 #include "base/tracked.h"
 
diff --git a/chrome/browser/accessibility/browser_accessibility_manager.cc b/chrome/browser/accessibility/browser_accessibility_manager.cc
index 00c5221..0bb8524 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager.cc
+++ b/chrome/browser/accessibility/browser_accessibility_manager.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
 
+#include "base/logging.h"
 #include "chrome/browser/accessibility/browser_accessibility.h"
 
 using webkit_glue::WebAccessibility;
diff --git a/chrome/browser/renderer_host/audio_renderer_host.cc b/chrome/browser/renderer_host/audio_renderer_host.cc
index 5bfc77e..0d8d9e7 100644
--- a/chrome/browser/renderer_host/audio_renderer_host.cc
+++ b/chrome/browser/renderer_host/audio_renderer_host.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/renderer_host/audio_renderer_host.h"
 
-#include "base/lock.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ -397,9 +396,9 @@ void AudioRendererHost::OnCreateStream(
   entry->render_view_id = msg.routing_id();
   entry->stream_id = stream_id;
 
- audio_entries_.insert(std::make_pair(
-     AudioEntryId(msg.routing_id(), stream_id),
-     entry.release()));
+  audio_entries_.insert(std::make_pair(
+      AudioEntryId(msg.routing_id(), stream_id),
+      entry.release()));
 }
 
 void AudioRendererHost::OnPlayStream(const IPC::Message& msg, int stream_id) {
diff --git a/chrome/browser/renderer_host/audio_renderer_host.h b/chrome/browser/renderer_host/audio_renderer_host.h
index d2dfd59..85311ab 100644
--- a/chrome/browser/renderer_host/audio_renderer_host.h
+++ b/chrome/browser/renderer_host/audio_renderer_host.h
@@ -61,7 +61,6 @@
 #include <map>
 
 #include "base/gtest_prod_util.h"
-#include "base/lock.h"
 #include "base/process.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
diff --git a/chrome/browser/sync/util/channel.h b/chrome/browser/sync/util/channel.h
index 4017d9f..a21f6ea 100644
--- a/chrome/browser/sync/util/channel.h
+++ b/chrome/browser/sync/util/channel.h
@@ -52,6 +52,7 @@
 
 #include "base/lock.h"
 #include "base/observer_list.h"
+#include "base/platform_thread.h"
 
 namespace browser_sync {
 
diff --git a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc b/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
index 6d779a2..24a162a 100644
--- a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
@@ -4,7 +4,11 @@
 
 #include "chrome/common/file_system/webfilesystem_callback_dispatcher.h"
 
+#include <string>
+#include <vector>
+
 #include "base/file_util_proxy.h"
+#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileSystem.h"
@@ -66,4 +70,3 @@ void WebFileSystemCallbackDispatcher::DidFail(
 void WebFileSystemCallbackDispatcher::DidWrite(int64 bytes, bool complete) {
   NOTREACHED();
 }
-
diff --git a/chrome/renderer/net/predictor_queue.h b/chrome/renderer/net/predictor_queue.h
index 64440bb..9e39d47 100644
--- a/chrome/renderer/net/predictor_queue.h
+++ b/chrome/renderer/net/predictor_queue.h
@@ -28,7 +28,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
 
 class DnsQueue {
diff --git a/chrome/test/webdriver/session_manager.cc b/chrome/test/webdriver/session_manager.cc
index 97bda11..6e49bb6 100644
--- a/chrome/test/webdriver/session_manager.cc
+++ b/chrome/test/webdriver/session_manager.cc
@@ -18,7 +18,6 @@
 #endif
 
 #include "base/command_line.h"
-#include "base/lock.h"
 #include "base/logging.h"
 #include "base/process.h"
 #include "base/process_util.h"
diff --git a/chrome_frame/test/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h
index d65e026..96a6707 100644
--- a/chrome_frame/test/ie_event_sink.h
+++ b/chrome_frame/test/ie_event_sink.h
@@ -10,7 +10,6 @@
 #include <exdispid.h>
 #include <string>
 
-#include "base/lock.h"
 #include "base/scoped_comptr_win.h"
 
 #include "chrome_frame/test_utils.h"
@@ -286,4 +285,3 @@ END_COM_MAP()
 }  // namespace chrome_frame_test
 
 #endif  // CHROME_FRAME_TEST_IE_EVENT_SINK_H_
-
diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h
index dec839d..068b964 100644
--- a/media/audio/simple_sources.h
+++ b/media/audio/simple_sources.h
@@ -7,7 +7,6 @@
 
 #include <list>
 
-#include "base/lock.h"
 #include "media/audio/audio_io.h"
 #include "media/base/seekable_buffer.h"
 
@@ -42,7 +41,7 @@ class SineWaveAudioSource : public AudioOutputStream::AudioSourceCallback {
 // defined by AudioSourceCallback are pull model only.
 class PushAudioOutput {
  public:
-  virtual ~PushAudioOutput(){}
+  virtual ~PushAudioOutput() {}
 
   // Write audio data to the audio device. It will be played eventually.
   // Returns false on failure.
diff --git a/media/base/filter_host.h b/media/base/filter_host.h
index c21b693..377cb97 100644
--- a/media/base/filter_host.h
+++ b/media/base/filter_host.h
@@ -17,7 +17,6 @@
 #ifndef MEDIA_BASE_FILTER_HOST_H_
 #define MEDIA_BASE_FILTER_HOST_H_
 
-#include "base/task.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline.h"
 
diff --git a/media/base/seekable_buffer.h b/media/base/seekable_buffer.h
index c1fd969..1431800 100644
--- a/media/base/seekable_buffer.h
+++ b/media/base/seekable_buffer.h
@@ -36,7 +36,6 @@
 #include <list>
 
 #include "base/basictypes.h"
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "media/base/buffers.h"
 
diff --git a/media/filters/audio_renderer_base.cc b/media/filters/audio_renderer_base.cc
index 2f889b9..b85e285 100644
--- a/media/filters/audio_renderer_base.cc
+++ b/media/filters/audio_renderer_base.cc
@@ -5,8 +5,10 @@
 #include "media/filters/audio_renderer_base.h"
 
 #include <algorithm>
+#include <string>
 
 #include "base/callback.h"
+#include "base/logging.h"
 #include "media/base/filter_host.h"
 #include "media/filters/audio_renderer_algorithm_ola.h"
 
diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc
index 3c7ce91..b0dcaf1 100644
--- a/media/filters/audio_renderer_impl.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -6,6 +6,7 @@
 
 #include <math.h>
 
+#include "base/logging.h"
 #include "media/base/filter_host.h"
 #include "media/audio/audio_manager.h"
 
diff --git a/media/filters/audio_renderer_impl.h b/media/filters/audio_renderer_impl.h
index 1e18a41..7829f95 100644
--- a/media/filters/audio_renderer_impl.h
+++ b/media/filters/audio_renderer_impl.h
@@ -17,7 +17,6 @@
 
 #include <deque>
 
-#include "base/lock.h"
 #include "media/audio/audio_io.h"
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h
index e4cdaeb..0dce80c 100644
--- a/media/filters/decoder_base.h
+++ b/media/filters/decoder_base.h
@@ -10,7 +10,6 @@
 #include <deque>
 
 #include "base/callback.h"
-#include "base/lock.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "base/thread.h"
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index 181149d..3fd1a04 100644
--- a/media/filters/file_data_source.cc
+++ b/media/filters/file_data_source.cc
@@ -5,6 +5,7 @@
 #include <limits>
 
 #include "base/file_util.h"
+#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
diff --git a/media/filters/null_audio_renderer.cc b/media/filters/null_audio_renderer.cc
index 7c3c039..b60b478 100644
--- a/media/filters/null_audio_renderer.cc
+++ b/media/filters/null_audio_renderer.cc
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
 #include <cmath>
 
+#include "base/logging.h"
 #include "media/base/filter_host.h"
 #include "media/filters/null_audio_renderer.h"
 
diff --git a/media/filters/null_audio_renderer.h b/media/filters/null_audio_renderer.h
index afbb098..038ac25 100644
--- a/media/filters/null_audio_renderer.h
+++ b/media/filters/null_audio_renderer.h
@@ -19,7 +19,6 @@
 
 #include <deque>
 
-#include "base/lock.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
 #include "media/base/buffers.h"
diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h
index 6df61b9..de9fc49 100644
--- a/media/filters/video_renderer_base.h
+++ b/media/filters/video_renderer_base.h
@@ -19,6 +19,7 @@
 
 #include "base/condition_variable.h"
 #include "base/lock.h"
+#include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
 #include "media/base/filters.h"
 #include "media/base/video_frame.h"
diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h
index c6ce45e..90e5217 100644
--- a/media/tools/player_x11/gl_video_renderer.h
+++ b/media/tools/player_x11/gl_video_renderer.h
@@ -6,7 +6,6 @@
 #define MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_
 
 #include "app/gfx/gl/gl_bindings.h"
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "media/base/filters.h"
 #include "media/filters/video_renderer_base.h"
diff --git a/media/tools/player_x11/gles_video_renderer.h b/media/tools/player_x11/gles_video_renderer.h
index ead864f..3fcb89a 100644
--- a/media/tools/player_x11/gles_video_renderer.h
+++ b/media/tools/player_x11/gles_video_renderer.h
@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_
-#define MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_
+#ifndef MEDIA_TOOLS_PLAYER_X11_GLES_VIDEO_RENDERER_H_
+#define MEDIA_TOOLS_PLAYER_X11_GLES_VIDEO_RENDERER_H_
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
-#include "base/lock.h"
+#include <utility>
+#include <vector>
+
 #include "base/scoped_ptr.h"
 #include "media/base/filters.h"
 #include "media/base/video_frame.h"
diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h
index 5076ef8..0129b60 100644
--- a/media/tools/player_x11/x11_video_renderer.h
+++ b/media/tools/player_x11/x11_video_renderer.h
@@ -7,7 +7,6 @@
 
 #include <X11/Xlib.h>
 
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "media/base/filters.h"
 #include "media/filters/video_renderer_base.h"
diff --git a/media/video/omx_video_decode_engine.h b/media/video/omx_video_decode_engine.h
index c5b3882..86cabe9 100644
--- a/media/video/omx_video_decode_engine.h
+++ b/media/video/omx_video_decode_engine.h
@@ -6,12 +6,11 @@
 #define MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_
 
 #include <queue>
+#include <utility>
 #include <vector>
 
 #include "base/callback.h"
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "media/omx/omx_configurator.h"
 #include "media/video/video_decode_engine.h"
 #include "third_party/openmax/il/OMX_Component.h"
diff --git a/net/base/transport_security_state.h b/net/base/transport_security_state.h
index b7db72c..49b44d7 100644
--- a/net/base/transport_security_state.h
+++ b/net/base/transport_security_state.h
@@ -11,7 +11,6 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 
diff --git a/webkit/glue/plugins/pepper_plugin_delegate.h b/webkit/glue/plugins/pepper_plugin_delegate.h
index 5e6f9a2..97f775a 100644
--- a/webkit/glue/plugins/pepper_plugin_delegate.h
+++ b/webkit/glue/plugins/pepper_plugin_delegate.h
@@ -12,7 +12,6 @@
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
-#include "base/task.h"
 #include "gfx/size.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/pp_completion_callback.h"
diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc
index 311be6c..0ffbeeb 100644
--- a/webkit/tools/test_shell/simple_appcache_system.cc
+++ b/webkit/tools/test_shell/simple_appcache_system.cc
@@ -4,8 +4,10 @@
 
 #include "webkit/tools/test_shell/simple_appcache_system.h"
 
+#include <string>
+#include <vector>
+
 #include "base/callback.h"
-#include "base/lock.h"
 #include "base/task.h"
 #include "base/waitable_event.h"
 #include "webkit/appcache/appcache_interceptor.h"
@@ -63,15 +65,15 @@ class SimpleFrontendProxy
       const appcache::AppCacheInfo& info) {
     if (!system_)
       return;
-    if (system_->is_io_thread())
+    if (system_->is_io_thread()) {
       system_->ui_message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
           this, &SimpleFrontendProxy::OnCacheSelected,
           host_id, info));
-    else if (system_->is_ui_thread()) {
+    } else if (system_->is_ui_thread()) {
       system_->frontend_impl_.OnCacheSelected(host_id, info);
-    }
-    else
+    } else {
       NOTREACHED();
+    }
   }
 
   virtual void OnStatusChanged(const std::vector<int>& host_ids,