Move the rest of the plugin code under chrome\browser to chrome\browser\plugins.

Review URL: https://codereview.chromium.org/11761018

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

13 files changed, 22 insertions, 28 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index e31b5ff..0e3bf14 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -23,7 +23,6 @@
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_content_browser_client.h"
-#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/component_updater/component_updater_configurator.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/defaults.h"
@@ -46,6 +45,7 @@
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 55de48b..20a4a83 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -45,6 +45,7 @@
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/plugins/plugin_info_message_filter.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ -58,7 +59,6 @@
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-#include "chrome/browser/renderer_host/plugin_info_message_filter.h"
 #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index b89c7ab..1b68f88 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -29,7 +29,6 @@
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
@@ -67,6 +66,7 @@
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index 67fb0f1..c0bebdc 100644
--- a/chrome/browser/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.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/browser/chrome_plugin_service_filter.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h
index 83fa17f..a1d5a72 100644
--- a/chrome/browser/chrome_plugin_service_filter.h
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.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_BROWSER_CHROME_PLUGIN_SERVICE_FILTER_H_
-#define CHROME_BROWSER_CHROME_PLUGIN_SERVICE_FILTER_H_
+#ifndef CHROME_BROWSER_PLUGINS_CHROME_PLUGIN_SERVICE_FILTER_H_
+#define CHROME_BROWSER_PLUGINS_CHROME_PLUGIN_SERVICE_FILTER_H_
 
 #include <map>
 #include <vector>
@@ -90,4 +90,4 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
   std::vector<OverriddenPlugin> overridden_plugins_;
 };
 
-#endif  // CHROME_BROWSER_CHROME_PLUGIN_SERVICE_FILTER_H_
+#endif  // CHROME_BROWSER_PLUGINS_CHROME_PLUGIN_SERVICE_FILTER_H_
diff --git a/chrome/browser/renderer_host/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
index 911e4cd..42acad0 100644
--- a/chrome/browser/renderer_host/plugin_info_message_filter.cc
+++ b/chrome/browser/plugins/plugin_info_message_filter.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/browser/renderer_host/plugin_info_message_filter.h"
+#include "chrome/browser/plugins/plugin_info_message_filter.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/renderer_host/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h
index 7b95342..a07be39 100644
--- a/chrome/browser/renderer_host/plugin_info_message_filter.h
+++ b/chrome/browser/plugins/plugin_info_message_filter.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_BROWSER_RENDERER_HOST_PLUGIN_INFO_MESSAGE_FILTER_H_
-#define CHROME_BROWSER_RENDERER_HOST_PLUGIN_INFO_MESSAGE_FILTER_H_
+#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INFO_MESSAGE_FILTER_H_
+#define CHROME_BROWSER_PLUGINS_PLUGIN_INFO_MESSAGE_FILTER_H_
 
 #include <string>
 #include <vector>
@@ -106,4 +106,4 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
   DISALLOW_COPY_AND_ASSIGN(PluginInfoMessageFilter);
 };
 
-#endif  // CHROME_BROWSER_RENDERER_HOST_PLUGIN_INFO_MESSAGE_FILTER_H_
+#endif  // CHROME_BROWSER_PLUGINS_PLUGIN_INFO_MESSAGE_FILTER_H_
diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc
index ba977c1..c39d497 100644
--- a/chrome/browser/printing/print_preview_dialog_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -13,7 +13,7 @@
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_plugin_service_filter.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index bafa313..f034e51 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -17,7 +17,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_service.h"
@@ -30,6 +29,7 @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/proxy_service_factory.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 387f2d5..b66c239 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -26,7 +26,6 @@
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ -51,6 +50,7 @@
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
diff --git a/chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc b/chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
index cd223f5..48aae58 100644
--- a/chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
+++ b/chrome/browser/renderer_host/plugin_info_message_filter_unittest.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/browser/renderer_host/plugin_info_message_filter.h"
+#include "chrome/browser/plugins/plugin_info_message_filter.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index c5517bc..515f888c 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -9,8 +9,8 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
-#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c3dcc69..fafd32c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -438,8 +438,6 @@
         'browser/chrome_page_zoom.h',
         'browser/chrome_page_zoom_constants.cc',
         'browser/chrome_page_zoom_constants.h',
-        'browser/chrome_plugin_service_filter.cc',
-        'browser/chrome_plugin_service_filter.h',
         'browser/chrome_quota_permission_context.cc',
         'browser/chrome_quota_permission_context.h',
         'browser/chrome_to_mobile_service.cc',
@@ -1284,14 +1282,18 @@
         'browser/platform_util_linux.cc',
         'browser/platform_util_mac.mm',
         'browser/platform_util_win.cc',
+        'browser/plugins/chrome_plugin_service_filter.cc',
+        'browser/plugins/chrome_plugin_service_filter.h',
         'browser/plugins/plugin_data_remover_helper.cc',
         'browser/plugins/plugin_data_remover_helper.h',
         'browser/plugins/plugin_finder.cc',
         'browser/plugins/plugin_finder.h',
-        'browser/plugins/plugin_installer.cc',
-        'browser/plugins/plugin_installer.h',
+        'browser/plugins/plugin_info_message_filter.cc',
+        'browser/plugins/plugin_info_message_filter.h',
         'browser/plugins/plugin_infobar_delegates.cc',
         'browser/plugins/plugin_infobar_delegates.h',
+        'browser/plugins/plugin_installer.cc',
+        'browser/plugins/plugin_installer.h',
         'browser/plugins/plugin_installer_observer.cc',
         'browser/plugins/plugin_installer_observer.h',
         'browser/plugins/plugin_metadata.cc',
@@ -1672,8 +1674,6 @@
         'browser/renderer_host/pepper/pepper_flash_device_id_host.h',
         'browser/renderer_host/pepper/pepper_talk_host.cc',
         'browser/renderer_host/pepper/pepper_talk_host.h',
-        'browser/renderer_host/plugin_info_message_filter.cc',
-        'browser/renderer_host/plugin_info_message_filter.h',
         'browser/renderer_host/safe_browsing_resource_throttle.cc',
         'browser/renderer_host/safe_browsing_resource_throttle.h',
         'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
@@ -2398,12 +2398,6 @@
             ['exclude', '^browser/plugins/'],
             ['exclude', '^browser/renderer_host/pepper/'],
           ],
-          'sources!': [
-            'browser/chrome_plugin_service_filter.cc',
-            'browser/chrome_plugin_service_filter.h',
-            'browser/renderer_host/plugin_info_message_filter.cc',
-            'browser/renderer_host/plugin_info_message_filter.h',
-          ],
         }],
         ['safe_browsing==1', {
           'defines': [