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

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

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

17 files changed, 7 insertions, 27 deletions

diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index 436d5cb..62ffa8e 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -9,9 +9,7 @@
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/registry.h"
 #include "base/scoped_bstr_win.h"
-#include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "chrome_tab.h" // NOLINT
 #include "chrome_frame/crash_reporting/crash_metrics.h"
@@ -385,4 +383,3 @@ void PatchHelper::UnpatchIfNeeded() {
 
   state_ = UNKNOWN;
 }
-
diff --git a/chrome_frame/bho.h b/chrome_frame/bho.h
index bbf6202..bae3385 100644
--- a/chrome_frame/bho.h
+++ b/chrome_frame/bho.h
@@ -15,7 +15,6 @@
 
 #include <string>
 
-#include "base/scoped_comptr_win.h"
 #include "chrome_tab.h"  // NOLINT
 #include "chrome_frame/delete_chrome_history.h"
 #include "chrome_frame/resource.h"
@@ -124,4 +123,3 @@ END_SINK_MAP()
 };
 
 #endif  // CHROME_FRAME_BHO_H_
-
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index bfd8e93..0fac7fc 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -21,7 +21,6 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/registry.h"
 #include "base/scoped_variant_win.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h
index e55e25e..ca77147 100644
--- a/chrome_frame/chrome_frame_activex.h
+++ b/chrome_frame/chrome_frame_activex.h
@@ -13,9 +13,6 @@
 #include <string>
 #include <vector>
 
-#include "base/scoped_bstr_win.h"
-#include "base/scoped_comptr_win.h"
-#include "base/scoped_variant_win.h"
 #include "chrome_frame/chrome_frame_activex_base.h"
 #include "chrome_frame/com_type_info_holder.h"
 #include "grit/chrome_frame_resources.h"
diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc
index 23638e5..52151a7 100644
--- a/chrome_frame/chrome_frame_npapi.cc
+++ b/chrome_frame/chrome_frame_npapi.cc
@@ -8,7 +8,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "base/win_util.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/ff_privilege_check.h"
 #include "chrome_frame/np_utils.h"
diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc
index 5752776..7080597 100644
--- a/chrome_frame/protocol_sink_wrap.cc
+++ b/chrome_frame/protocol_sink_wrap.cc
@@ -8,7 +8,6 @@
 #include "chrome_frame/protocol_sink_wrap.h"
 
 #include "base/logging.h"
-#include "base/registry.h"
 #include "base/scoped_bstr_win.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 78fccc1..5f59f6c 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -23,7 +23,7 @@
 #include "base/registry.h"   // to find IE and firefox
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_handle.h"
-#include "base/scoped_comptr_win.h"
+#include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 0df5285..f05a487 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -19,7 +19,6 @@
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/scoped_comptr_win.h"
-#include "base/scoped_variant_win.h"
 
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/test/simulate_input.h"
diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc
index f8a0cad..f069898 100644
--- a/chrome_frame/test/html_util_unittests.cc
+++ b/chrome_frame/test/html_util_unittests.cc
@@ -16,7 +16,6 @@
 #include "base/ref_counted.h"
 #include "base/scoped_handle.h"
 #include "base/task.h"
-#include "base/win_util.h"
 #include "net/base/net_util.h"
 
 #include "chrome_frame/chrome_frame_automation.h"
@@ -368,4 +367,3 @@ TEST(HttpUtils, HasFrameBustingHeader) {
     "X-Frame-Options: SAMEORIGIN\r\n"
     "X-Frame-Options: ALLOWall\r\n"));
 }
-
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index fac3dc5..23d55f1 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -6,9 +6,9 @@
 
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_handle.h"
+#include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index 52f0aac..ebf60b0 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -5,7 +5,6 @@
 #include <string>
 
 #include "base/scoped_comptr_win.h"
-#include "base/win_util.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 #include "chrome_frame/test/mock_ie_event_sink_test.h"
@@ -706,4 +705,3 @@ TEST_P(FullTabNavigationTest, CF_UnloadEventTest) {
 }
 
 }  // namespace chrome_frame_test
-
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 57b829e..8a182bd 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -15,9 +15,7 @@
 #include "base/file_version_info.h"
 #include "base/i18n/icu_util.h"
 #include "base/path_service.h"
-#include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
-#include "base/scoped_variant_win.h"
 
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/browser_prefs.h"
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index f784bcf..2e44e04 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -31,7 +31,6 @@
 #include "base/keyboard_codes.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
-#include "base/registry.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
@@ -628,4 +627,3 @@ void SetPageRange(const CommandLine& parsed_command_line) {
     }
   }
 }
-
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc
index 623a044..2a535d1 100644
--- a/chrome_frame/test/test_server.cc
+++ b/chrome_frame/test/test_server.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <windows.h>
+#include <objbase.h>
+#include <urlmon.h>
+
 #include "base/logging.h"
-#include "base/registry.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index 411e07c..143df63 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -5,6 +5,7 @@
 #include <mshtmcid.h>
 #include <string>
 
+#include "base/scoped_variant_win.h"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
@@ -539,4 +540,3 @@ TEST_F(ContextMenuTest, DISABLED_BackForwardWithSwitch) {
 }
 
 }  // namespace chrome_frame_test
-
diff --git a/chrome_frame/urlmon_moniker.h b/chrome_frame/urlmon_moniker.h
index 1f168a8..9c456b4 100644
--- a/chrome_frame/urlmon_moniker.h
+++ b/chrome_frame/urlmon_moniker.h
@@ -12,7 +12,6 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/scoped_comptr_win.h"
 #include "base/thread_local.h"
 #include "googleurl/src/gurl.h"
 #include "chrome_frame/utils.h"
diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h
index f17af4c..7fc14b6 100644
--- a/chrome_frame/urlmon_url_request.h
+++ b/chrome_frame/urlmon_url_request.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "base/lock.h"
-#include "base/scoped_comptr_win.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "chrome_frame/plugin_url_request.h"
@@ -129,4 +128,3 @@ class UrlmonUrlRequestManager
 };
 
 #endif  // CHROME_FRAME_URLMON_URL_REQUEST_H_
-