Move more files from chrome/common to chrome/browser

to further reduce bad dependencies on chrome/browser.

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

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

28 files changed, 41 insertions, 40 deletions

diff --git a/chrome/common/accessibility_events.cc b/chrome/browser/accessibility_events.cc
index 17dc491..fa1820a 100644
--- a/chrome/common/accessibility_events.cc
+++ b/chrome/browser/accessibility_events.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/accessibility_events.h"
+
 #include "chrome/browser/extensions/extension_accessibility_api_constants.h"
 #include "chrome/browser/profile.h"
-#include "chrome/common/accessibility_events.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 
diff --git a/chrome/common/accessibility_events.h b/chrome/browser/accessibility_events.h
index bfcf2ae..2ef7535 100644
--- a/chrome/common/accessibility_events.h
+++ b/chrome/browser/accessibility_events.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_ACCESSIBILITY_EVENTS_H_
-#define CHROME_COMMON_ACCESSIBILITY_EVENTS_H_
+#ifndef CHROME_BROWSER_ACCESSIBILITY_EVENTS_H_
+#define CHROME_BROWSER_ACCESSIBILITY_EVENTS_H_
 
 #include <string>
 
@@ -202,4 +202,4 @@ class AccessibilityTextBoxInfo : public AccessibilityControlInfo {
   int selection_end_;
 };
 
-#endif  // CHROME_COMMON_ACCESSIBILITY_EVENTS_H_
+#endif  // CHROME_BROWSER_ACCESSIBILITY_EVENTS_H_
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index e3f6fefc..93ebc68 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -91,6 +91,7 @@
 #include "app/win_util.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/cert_store.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/shell_integration.h"
@@ -98,7 +99,6 @@
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/location_bar_view.h"
-#include "chrome/common/child_process_host.h"
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index cb4a529..9edd612 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/browser_trial.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/debugger/devtools_manager.h"
@@ -37,7 +38,6 @@
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/appcache/chrome_appcache_service.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/common/child_process_host.cc b/chrome/browser/child_process_host.cc
index 51c6de4..3aea690 100644
--- a/chrome/common/child_process_host.cc
+++ b/chrome/browser/child_process_host.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/child_process_host.h"
+#include "chrome/browser/child_process_host.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
diff --git a/chrome/common/child_process_host.h b/chrome/browser/child_process_host.h
index 22d5cc3..735bcd8 100644
--- a/chrome/common/child_process_host.h
+++ b/chrome/browser/child_process_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_CHILD_PROCESS_HOST_H_
-#define CHROME_COMMON_CHILD_PROCESS_HOST_H_
+#ifndef CHROME_BROWSER_CHILD_PROCESS_HOST_H_
+#define CHROME_BROWSER_CHILD_PROCESS_HOST_H_
 
 #include <list>
 #include <string>
@@ -151,4 +151,4 @@ class ChildProcessHost : public ResourceDispatcherHost::Receiver,
   scoped_ptr<ChildProcessLauncher> child_process_;
 };
 
-#endif  // CHROME_COMMON_CHILD_PROCESS_HOST_H_
+#endif  // CHROME_BROWSER_CHILD_PROCESS_HOST_H_
diff --git a/chrome/common/chrome_plugin_unittest.cc b/chrome/browser/chrome_plugin_unittest.cc
index 43e3c53..e515966 100644
--- a/chrome/common/chrome_plugin_unittest.cc
+++ b/chrome/browser/chrome_plugin_unittest.cc
@@ -140,6 +140,7 @@ void ChromePluginTest::LoadPlugin() {
   PathService::Get(base::DIR_EXE, &path);
   path = path.AppendASCII(kPluginFilename);
   plugin_ = ChromePluginLib::Create(path, GetCPBrowserFuncsForBrowser());
+  ASSERT_TRUE(plugin_);
 
   // Exchange test APIs with the plugin.
   TestFuncParams params;
@@ -147,8 +148,6 @@ void ChromePluginTest::LoadPlugin() {
   params.bfuncs.invoke_later = CPT_InvokeLater;
   EXPECT_EQ(CPERR_SUCCESS, plugin_->CP_Test(&params));
   test_funcs_ = params.pfuncs;
-
-  EXPECT_TRUE(plugin_);
 }
 
 void ChromePluginTest::UnloadPlugin() {
@@ -213,11 +212,9 @@ void ChromePluginTest::OnURLRequestComplete() {
   // main loop returns and this thread subsequently goes out of scope.
 }
 
-};  // namespace
-
 // Tests that the plugin can intercept URLs.
 TEST_F(ChromePluginTest, DoesIntercept) {
-  for (int i = 0; i < arraysize(kChromeTestPluginPayloads); ++i) {
+  for (size_t i = 0; i < arraysize(kChromeTestPluginPayloads); ++i) {
     RunTest(GURL(kChromeTestPluginPayloads[i].url),
             &kChromeTestPluginPayloads[i]);
   }
@@ -300,3 +297,6 @@ TEST_F(ChromePluginTest, DoesNotInterceptOwnRequest) {
 
   MessageLoop::current()->Run();
 }
+
+}  // namespace
+
diff --git a/chrome/browser/extensions/extension_accessibility_api.h b/chrome/browser/extensions/extension_accessibility_api.h
index 3083b62..fb3cb8d 100644
--- a/chrome/browser/extensions/extension_accessibility_api.h
+++ b/chrome/browser/extensions/extension_accessibility_api.h
@@ -10,8 +10,8 @@
 
 #include "base/callback.h"
 #include "base/singleton.h"
+#include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/extensions/extension_function.h"
-#include "chrome/common/accessibility_events.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc
index e35cdd9..f2cdc80 100644
--- a/chrome/browser/gpu_process_host.cc
+++ b/chrome/browser/gpu_process_host.cc
@@ -8,9 +8,9 @@
 #include "base/singleton.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/child_process_launcher.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/child_process_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gpu_messages.h"
diff --git a/chrome/browser/gtk/accessibility_event_router_gtk.h b/chrome/browser/gtk/accessibility_event_router_gtk.h
index d0fd99d..7943ea4 100644
--- a/chrome/browser/gtk/accessibility_event_router_gtk.h
+++ b/chrome/browser/gtk/accessibility_event_router_gtk.h
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/singleton.h"
-#include "chrome/common/accessibility_events.h"
+#include "chrome/browser/accessibility_events.h"
 
 class Profile;
 
diff --git a/chrome/browser/gtk/accessible_widget_helper_gtk.h b/chrome/browser/gtk/accessible_widget_helper_gtk.h
index 775b92e..94e9140 100644
--- a/chrome/browser/gtk/accessible_widget_helper_gtk.h
+++ b/chrome/browser/gtk/accessible_widget_helper_gtk.h
@@ -12,8 +12,8 @@
 
 #include "base/basictypes.h"
 #include "base/singleton.h"
+#include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/gtk/accessibility_event_router_gtk.h"
-#include "chrome/common/accessibility_events.h"
 
 class Profile;
 
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
index 073d498..e6efa7c 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/gtk/location_bar_view_gtk.cc
@@ -14,6 +14,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #include "chrome/browser/browser.h"
@@ -34,7 +35,6 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/accessibility_events.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/gtk_util.h"
diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc
index 80b5642..b459f46 100644
--- a/chrome/browser/gtk/options/options_window_gtk.cc
+++ b/chrome/browser/gtk/options/options_window_gtk.cc
@@ -9,6 +9,7 @@
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
+#include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
@@ -20,7 +21,6 @@
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/window_sizer.h"
-#include "chrome/common/accessibility_events.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 227d629..fc33220 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -8,13 +8,13 @@
 #include "base/file_version_info.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/backing_store_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 
diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc
index 1308fb8..e7780bf 100644
--- a/chrome/browser/memory_details_linux.cc
+++ b/chrome/browser/memory_details_linux.cc
@@ -14,8 +14,8 @@
 #include "base/string_util.h"
 #include "base/process_util.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc
index 577a809..fda205e 100644
--- a/chrome/browser/memory_details_mac.cc
+++ b/chrome/browser/memory_details_mac.cc
@@ -16,13 +16,13 @@
 #include "base/process_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/process_info_snapshot.h"
 #include "chrome/browser/renderer_host/backing_store_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
index 34beb3e..65140b3 100644
--- a/chrome/browser/memory_details_win.cc
+++ b/chrome/browser/memory_details_win.cc
@@ -8,12 +8,12 @@
 #include "app/l10n_util.h"
 #include "base/file_version_info.h"
 #include "base/string_util.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/backing_store_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 
diff --git a/chrome/browser/nacl_host/nacl_broker_host.h b/chrome/browser/nacl_host/nacl_broker_host.h
index f526aa1..15dd18b 100644
--- a/chrome/browser/nacl_host/nacl_broker_host.h
+++ b/chrome/browser/nacl_host/nacl_broker_host.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/process.h"
-#include "chrome/common/child_process_host.h"
+#include "chrome/browser/child_process_host.h"
 #include "ipc/ipc_message.h"
 
 class NaClBrokerHost : public ChildProcessHost {
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h
index bf96b83..a89b2da 100644
--- a/chrome/browser/nacl_host/nacl_process_host.h
+++ b/chrome/browser/nacl_host/nacl_process_host.h
@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 
 #include "base/ref_counted.h"
-#include "chrome/common/child_process_host.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/common/nacl_types.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
 
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index 5ab1ef1..3f1237b 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -9,6 +9,7 @@
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/notifications/notification.h"
@@ -23,7 +24,6 @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/worker_host/worker_process_host.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h
index 8218c65..3140c9b 100644
--- a/chrome/browser/plugin_process_host.h
+++ b/chrome/browser/plugin_process_host.h
@@ -16,9 +16,9 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
-#include "chrome/common/child_process_host.h"
 #include "ipc/ipc_channel_handle.h"
 #include "webkit/glue/webplugininfo.h"
 
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 6e18eee..2ea6175 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -23,6 +23,7 @@
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ -44,7 +45,6 @@
 #include "chrome/browser/visitedlink_master.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/child_process_info.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc
index 6c8dcad..de40cf3 100644
--- a/chrome/browser/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager_resource_providers.cc
@@ -24,6 +24,7 @@
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ -33,7 +34,6 @@
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
@@ -166,7 +166,7 @@ TaskManager::Resource* TaskManagerTabContentsResourceProvider::GetResource(
       tab_util::GetTabContentsByID(render_process_host_id, routing_id);
   if (!tab_contents)  // Not one of our resource.
     return NULL;
-  
+
   base::ProcessHandle process_handle =
       tab_contents->GetRenderProcessHost()->GetHandle();
   if (!process_handle) {
diff --git a/chrome/browser/utility_process_host.h b/chrome/browser/utility_process_host.h
index 3b5d58f..8448318 100644
--- a/chrome/browser/utility_process_host.h
+++ b/chrome/browser/utility_process_host.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/common/child_process_host.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "ipc/ipc_channel.h"
 
diff --git a/chrome/browser/worker_host/worker_process_host.h b/chrome/browser/worker_host/worker_process_host.h
index 4f7ecbd..ea585dd 100644
--- a/chrome/browser/worker_host/worker_process_host.h
+++ b/chrome/browser/worker_host/worker_process_host.h
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "chrome/browser/child_process_host.h"
 #include "chrome/browser/worker_host/worker_document_set.h"
-#include "chrome/common/child_process_host.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6a45dcb..0d65bef 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -40,6 +40,8 @@
       'sources': [
         # All .cc, .h, .m, and .mm files under browser except for tests and
         # mocks.
+        'browser/accessibility_events.h',
+        'browser/accessibility_events.cc',
         'browser/alternate_nav_url_fetcher.cc',
         'browser/alternate_nav_url_fetcher.h',
         'browser/app_controller_cppsafe_mac.h',
@@ -262,6 +264,8 @@
         'browser/cert_store.h',
         'browser/character_encoding.cc',
         'browser/character_encoding.h',
+        'browser/child_process_host.cc',
+        'browser/child_process_host.h',
         'browser/child_process_launcher.cc',
         'browser/child_process_launcher.h',
         'browser/child_process_security_policy.cc',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 199cac5..9f07af8 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -23,8 +23,6 @@
           # .cc, .h, and .mm files under chrome/common that are used on all
           # platforms, including both 32-bit and 64-bit Windows.
           # Test files are not included.
-          'common/accessibility_events.h',
-          'common/accessibility_events.cc',
           'common/app_mode_constants_mac.h',
           'common/app_mode_constants_mac.mm',
           'common/bindings_policy.h',
@@ -190,8 +188,6 @@
         'common/appcache/chrome_appcache_service.h',
         'common/automation_constants.cc',
         'common/automation_constants.h',
-        'common/child_process_host.cc',
-        'common/child_process_host.h',
         'common/chrome_descriptors.h',
         'common/chrome_plugin_api.h',
         'common/chrome_plugin_lib.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3708a49..9a71489 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -562,6 +562,7 @@
         'browser/debugger/devtools_remote_listen_socket_unittest.h',
         'browser/diagnostics/diagnostics_model_unittest.cc',
         'browser/child_process_security_policy_unittest.cc',
+        'browser/chrome_plugin_unittest.cc',
         'browser/chrome_thread_unittest.cc',
         'browser/chromeos/external_cookie_handler_unittest.cc',
         'browser/chromeos/external_metrics_unittest.cc',
@@ -856,7 +857,6 @@
         'browser/window_sizer_unittest.cc',
         'common/bzip2_unittest.cc',
         'common/child_process_logging_mac_unittest.mm',
-        'common/chrome_plugin_unittest.cc',
         'common/common_param_traits_unittest.cc',
         'common/extensions/extension_resource_unittest.cc',
         'common/extensions/extension_unittest.cc',
@@ -1063,6 +1063,7 @@
             'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
             'browser/bookmarks/bookmark_table_model_unittest.cc',
             'browser/browser_unittest.cc',
+            'browser/chrome_plugin_unittest.cc',
             'browser/extensions/extension_process_manager_unittest.cc',
             'browser/importer/importer_unittest.cc',
             'browser/login_prompt_unittest.cc',
@@ -1074,7 +1075,6 @@
             'browser/views/extensions/browser_action_drag_data_unittest.cc',
             'browser/views/find_bar_host_unittest.cc',
             'browser/views/keyword_editor_view_unittest.cc',
-            'common/chrome_plugin_unittest.cc',
             'common/net/url_util_unittest.cc',
           ],
         }],