Move more extensions code from ChromeContentBrowserClient to ChromeContentBrowserClientExtensionsPa…

chrome/browser/extensions/chrome_content_browser_client_extensions_part.h

Index: chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
index 94ba4a52dda6b8f6d6bf6282de134895b73e26c6..2c0a12f5521a4020ef436328362cd797195cefaa 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
@@ -9,6 +9,10 @@
 #include "base/macros.h"
 #include "chrome/browser/chrome_content_browser_client_parts.h"
 
+namespace content {
+class ResourceContext;
+}
+
 namespace extensions {
 
 class BrowserPermissionsPolicyDelegate;
@@ -20,6 +24,38 @@ class ChromeContentBrowserClientExtensionsPart
   ChromeContentBrowserClientExtensionsPart();
   virtual ~ChromeContentBrowserClientExtensionsPart();
 
+  // Corresponds to the ChromeContentBrowserClient function of the same name.
+  static GURL GetEffectiveURL(Profile* profile, const GURL& url);
+  static bool ShouldUseProcessPerSite(Profile* profile,
+                                      const GURL& effective_url);
+  static bool CanCommitURL(content::RenderProcessHost* process_host,
+                           const GURL& url);
+  static bool IsSuitableHost(Profile* profile,
+                             content::RenderProcessHost* process_host,
+                             const GURL& site_url);
+  static bool ShouldTryToUseExistingProcessHost(Profile* profile,
+                                                const GURL& url);
+  static bool ShouldSwapBrowsingInstancesForNavigation(
+      content::SiteInstance* site_instance,
+      const GURL& current_url,
+      const GURL& new_url);
+  static bool ShouldSwapProcessesForRedirect(
+      content::ResourceContext* resource_context,
+      const GURL& current_url,
+      const GURL& new_url);
+  static std::string GetWorkerProcessTitle(const GURL& url,
+                                           content::ResourceContext* context);
+
+  // Similiar to ChromeContentBrowserClient::ShouldAllowOpenURL(), but the
+  // return value indicates whether to use |result| or not.
+  static bool ShouldAllowOpenURL(content::SiteInstance* site_instance,

[Lei Zhang, 2014/08/01 22:46:36]

I'm too lazy to write:

for (size_t i = 0; i < extra_parts_.size(); ++i) {
  bool result;
  if (PartFunction(..., &result)
     return result;
}

for all of the methods above, especially since many of them are one offs just
for extensions code. If I do more cleanup in the future and find that we can use
the pattern above, I'll convert these static methods to virtual methods in
ChromeContentBrowserClientParts.

[Yoyo Zhou, 2014/08/01 23:11:35]

I imagine that many of these methods exist on ChromeContentBrowserClient solely
because of extensions (i.e. the only difference from the content module is what
extensions does, not what chrome does). Seems okay to me for now. Up to you
whether this merits a TODO.

+                                 const GURL& from_url,
+                                 const GURL& to_url,
+                                 bool* result);
+
+  // Helper function to call InfoMap::SetSigninProcess().
+  static void SetSigninProcess(content::SiteInstance* site_instance);
+
  private:
   // ChromeContentBrowserClientParts:
   virtual void RenderProcessWillLaunch(
@@ -50,6 +86,8 @@ class ChromeContentBrowserClientExtensionsPart
       content::RenderProcessHost* process,
       Profile* profile) OVERRIDE;
 
+  scoped_ptr<BrowserPermissionsPolicyDelegate> permissions_policy_delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientExtensionsPart);
 };