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

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

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

29 files changed, 16 insertions, 30 deletions

diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc
index ba0ca91..ac6ec80 100644
--- a/chrome/browser/aeropeek_manager.cc
+++ b/chrome/browser/aeropeek_manager.cc
@@ -12,6 +12,7 @@
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_handle_win.h"
 #include "base/scoped_native_library.h"
+#include "base/waitable_event.h"
 #include "base/win_util.h"
 #include "chrome/browser/app_icon_win.h"
 #include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/aeropeek_manager.h b/chrome/browser/aeropeek_manager.h
index 957adfc..80f6ba6 100644
--- a/chrome/browser/aeropeek_manager.h
+++ b/chrome/browser/aeropeek_manager.h
@@ -6,9 +6,10 @@
 #define CHROME_BROWSER_AEROPEEK_MANAGER_H_
 #pragma once
 
+#include <windows.h>
+
 #include <list>
 
-#include "base/waitable_event.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "gfx/insets.h"
 
diff --git a/chrome/browser/browser_child_process_host.cc b/chrome/browser/browser_child_process_host.cc
index be7a037..04be500 100644
--- a/chrome/browser/browser_child_process_host.cc
+++ b/chrome/browser/browser_child_process_host.cc
@@ -13,7 +13,6 @@
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "base/waitable_event.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index bfadc0d..48676ed 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -17,7 +17,6 @@
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/time.h"
-#include "base/waitable_event.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/configuration_policy_provider_win.cc b/chrome/browser/configuration_policy_provider_win.cc
index b70f01d..9549367 100644
--- a/chrome/browser/configuration_policy_provider_win.cc
+++ b/chrome/browser/configuration_policy_provider_win.cc
@@ -16,7 +16,6 @@
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "base/waitable_event.h"
 #include "chrome/common/policy_constants.h"
 
 ConfigurationPolicyProviderWin::GroupPolicyChangeWatcher::
diff --git a/chrome/browser/file_watcher_inotify.cc b/chrome/browser/file_watcher_inotify.cc
index 0fc2532..c651408 100644
--- a/chrome/browser/file_watcher_inotify.cc
+++ b/chrome/browser/file_watcher_inotify.cc
@@ -27,7 +27,6 @@
 #include "base/singleton.h"
 #include "base/task.h"
 #include "base/thread.h"
-#include "base/waitable_event.h"
 
 namespace {
 
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 48c4d53..a9cee1f 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -4,7 +4,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/js_modal_dialog.h b/chrome/browser/js_modal_dialog.h
index 8bedb73..7cfe34f 100644
--- a/chrome/browser/js_modal_dialog.h
+++ b/chrome/browser/js_modal_dialog.h
@@ -12,7 +12,6 @@
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "net/base/cookie_monster.h"
 
 #if defined(OS_MACOSX)
 #if __OBJC__
diff --git a/chrome/browser/js_modal_dialog_mac.mm b/chrome/browser/js_modal_dialog_mac.mm
index ee9f74c..ca21e55 100644
--- a/chrome/browser/js_modal_dialog_mac.mm
+++ b/chrome/browser/js_modal_dialog_mac.mm
@@ -9,6 +9,7 @@
 #include "app/l10n_util_mac.h"
 #include "app/message_box_flags.h"
 #import "base/cocoa_protocols_mac.h"
+#include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "grit/app_strings.h"
diff --git a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
index 78a16d7..3bdb695 100644
--- a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
+++ b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 
-#include "base/waitable_event.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/mock_proxy_resolver.h"
 #include "net/proxy/proxy_config_service.h"
diff --git a/chrome/browser/renderer_host/audio_renderer_host.cc b/chrome/browser/renderer_host/audio_renderer_host.cc
index 5c14523..231b9c6 100644
--- a/chrome/browser/renderer_host/audio_renderer_host.cc
+++ b/chrome/browser/renderer_host/audio_renderer_host.cc
@@ -9,7 +9,6 @@
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "base/sys_info.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/renderer_host/audio_sync_reader.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_logging.h"
diff --git a/chrome/browser/renderer_host/audio_renderer_host.h b/chrome/browser/renderer_host/audio_renderer_host.h
index 260743b..074ec66 100644
--- a/chrome/browser/renderer_host/audio_renderer_host.h
+++ b/chrome/browser/renderer_host/audio_renderer_host.h
@@ -66,7 +66,6 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/chrome_thread.h"
 #include "ipc/ipc_message.h"
 #include "media/audio/audio_io.h"
diff --git a/chrome/browser/renderer_host/audio_renderer_host_unittest.cc b/chrome/browser/renderer_host/audio_renderer_host_unittest.cc
index f86cbdc..08a7b4e 100644
--- a/chrome/browser/renderer_host/audio_renderer_host_unittest.cc
+++ b/chrome/browser/renderer_host/audio_renderer_host_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/sync_socket.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/audio_renderer_host.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 15f4e43..6089f2a 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -13,7 +13,6 @@
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "base/time.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/blocked_plugin_manager.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/child_process_security_policy.h"
diff --git a/chrome/browser/sync/engine/all_status.h b/chrome/browser/sync/engine/all_status.h
index 3989143..772f40d 100644
--- a/chrome/browser/sync/engine/all_status.h
+++ b/chrome/browser/sync/engine/all_status.h
@@ -11,7 +11,6 @@
 
 #include <map>
 
-#include "base/atomicops.h"
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/sync/util/channel.h"
diff --git a/chrome/browser/sync/engine/auth_watcher.h b/chrome/browser/sync/engine/auth_watcher.h
index f853642..9400bd1 100644
--- a/chrome/browser/sync/engine/auth_watcher.h
+++ b/chrome/browser/sync/engine/auth_watcher.h
@@ -12,7 +12,6 @@
 #include <map>
 #include <string>
 
-#include "base/atomicops.h"
 #include "base/gtest_prod_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/ref_counted.h"
diff --git a/chrome/browser/sync/glue/database_model_worker.cc b/chrome/browser/sync/glue/database_model_worker.cc
index 13f5122..7df6abc 100644
--- a/chrome/browser/sync/glue/database_model_worker.cc
+++ b/chrome/browser/sync/glue/database_model_worker.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/sync/glue/database_model_worker.h"
 
+#include "base/waitable_event.h"
 #include "chrome/browser/chrome_thread.h"
 
 using base::WaitableEvent;
diff --git a/chrome/browser/sync/glue/database_model_worker.h b/chrome/browser/sync/glue/database_model_worker.h
index cd19620..08e77b0 100644
--- a/chrome/browser/sync/glue/database_model_worker.h
+++ b/chrome/browser/sync/glue/database_model_worker.h
@@ -8,9 +8,12 @@
 
 #include "base/callback.h"
 #include "base/ref_counted.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 
+namespace base {
+class WaitableEvent;
+}
+
 namespace browser_sync {
 
 // A ModelSafeWorker for database models (eg. autofill) that accepts requests
diff --git a/chrome/browser/sync/glue/ui_model_worker.h b/chrome/browser/sync/glue/ui_model_worker.h
index 208988d..f1df84c 100644
--- a/chrome/browser/sync/glue/ui_model_worker.h
+++ b/chrome/browser/sync/glue/ui_model_worker.h
@@ -10,10 +10,13 @@
 #include "base/condition_variable.h"
 #include "base/lock.h"
 #include "base/task.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 
+namespace base {
+class WaitableEvent;
+}
+
 class MessageLoop;
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
index 79e9fb0..e71a254 100644
--- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/thread.h"
+#include "base/waitable_event.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index ce88900..75b19d1 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -15,7 +15,6 @@
 #include "base/task.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/autofill/autofill_common_unittest.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
@@ -38,7 +37,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 
 using base::Time;
-using base::WaitableEvent;
 using browser_sync::AutofillChangeProcessor;
 using browser_sync::AutofillDataTypeController;
 using browser_sync::AutofillModelAssociator;
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index 7d7c7e3..bdc4037 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -9,7 +9,6 @@
 #include "base/task.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/engine/syncapi.h"
@@ -34,7 +33,6 @@
 #include "webkit/glue/password_form.h"
 
 using base::Time;
-using base::WaitableEvent;
 using browser_sync::PasswordChangeProcessor;
 using browser_sync::PasswordDataTypeController;
 using browser_sync::PasswordModelAssociator;
diff --git a/chrome/browser/sync/syncable/directory_manager.h b/chrome/browser/sync/syncable/directory_manager.h
index d5dfea8..55cc28c 100644
--- a/chrome/browser/sync/syncable/directory_manager.h
+++ b/chrome/browser/sync/syncable/directory_manager.h
@@ -16,7 +16,6 @@
 #include <string>
 #include <vector>
 
-#include "base/atomicops.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/lock.h"
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
index 331f086..06ba3be 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
@@ -9,7 +9,6 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/waitable_event.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/common/window_container_type.h"
 #include "gfx/rect.h"
diff --git a/chrome/common/deprecated/event_sys-inl.h b/chrome/common/deprecated/event_sys-inl.h
index 5baa6b4..2699a58 100644
--- a/chrome/common/deprecated/event_sys-inl.h
+++ b/chrome/common/deprecated/event_sys-inl.h
@@ -8,7 +8,6 @@
 
 #include <map>
 
-#include "base/atomicops.h"
 #include "base/basictypes.h"
 #include "base/condition_variable.h"
 #include "base/lock.h"
diff --git a/chrome/gpu/gpu_channel.cc b/chrome/gpu/gpu_channel.cc
index 36dbe3a..69c66d4 100644
--- a/chrome/gpu/gpu_channel.cc
+++ b/chrome/gpu/gpu_channel.cc
@@ -2,18 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/gpu/gpu_channel.h"
+
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
-#include "chrome/gpu/gpu_channel.h"
-
 #include "base/command_line.h"
 #include "base/lock.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
-#include "base/waitable_event.h"
-#include "build/build_config.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/renderer/media/audio_renderer_impl.h b/chrome/renderer/media/audio_renderer_impl.h
index ebc3240..5c34a7d 100644
--- a/chrome/renderer/media/audio_renderer_impl.h
+++ b/chrome/renderer/media/audio_renderer_impl.h
@@ -42,7 +42,6 @@
 #include "base/scoped_ptr.h"
 #include "base/lock.h"
 #include "base/shared_memory.h"
-#include "base/waitable_event.h"
 #include "chrome/renderer/audio_message_filter.h"
 #include "media/audio/audio_io.h"
 #include "media/base/factory.h"
diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index 368e3d4..6430798 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_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/waitable_event.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/render_thread.h"
diff --git a/chrome/test/automation/extension_proxy.h b/chrome/test/automation/extension_proxy.h
index 1257b9e..485d469 100644
--- a/chrome/test/automation/extension_proxy.h
+++ b/chrome/test/automation/extension_proxy.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/weak_ptr.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_handle_tracker.h"