Split ChromeContentBrowserClient into smaller parts.

chrome/browser/chrome_content_browser_client.h

Index: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index eb2f90b6cb9465693eb71525eebf4157389096f2..eb3429b7bf754ba31aa410946d3b8402954b8d94 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -31,6 +31,10 @@ namespace extensions {
 class BrowserPermissionsPolicyDelegate;
 }
 
+namespace plugins {
+class ChromeContentBrowserClientPluginsPart;
+}
+
 namespace prerender {
 class PrerenderTracker;
 }
@@ -326,16 +330,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       const base::Callback<void(bool)>& callback);
 #endif
 
-#if defined(ENABLE_PLUGINS)
-  // Set of origins that can use TCP/UDP private APIs from NaCl.
-  std::set<std::string> allowed_socket_origins_;
-  // Set of origins that can get a handle for FileIO from NaCl.
-  std::set<std::string> allowed_file_handle_origins_;
-  // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
-  // versions of Chrome.
-  std::set<std::string> allowed_dev_channel_origins_;
-#endif
-
   // The prerender tracker used to determine whether a render process is used
   // for prerendering and an override cookie store must be provided.
   // This needs to be kept as a member rather than just looked up from
@@ -348,6 +342,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   // Parts are deleted in the reverse order they are added.
   std::vector<ChromeContentBrowserClientParts*> extra_parts_;
 
+  plugins::ChromeContentBrowserClientPluginsPart* plugin_parts_;

[Lei Zhang, 2014/11/18 03:14:46]

ChromeContentBrowserClientPluginsPart should be a subclass of
ChromeContentBrowserClientParts, and added to |extra_parts_| instead of being in
a separate |plugin_parts_|.

+
   base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);