Remove all the browser side extensions code from Android.

Remove all the browser side extensions code from Android.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288184

[Lei Zhang, 2014-08-06 21:44:56]

It's not the cleanest, but it gets the job done. After this CL, I'll go ahead
and try to clean up some of the mess and various bits of scaffolding.

[Yoyo Zhou, 2014-08-06 23:04:13]

LGTM

https://chromiumcodereview.appspot.com/434613003/diff/80001/chrome/chrome_bro...
File chrome/chrome_browser_extensions.gypi (left):

https://chromiumcodereview.appspot.com/434613003/diff/80001/chrome/chrome_bro...
chrome/chrome_browser_extensions.gypi:1018:
'<@(chrome_browser_extensions_extensions_sources)',
Is this intentional?

[Lei Zhang, 2014-08-06 23:07:03]

https://chromiumcodereview.appspot.com/434613003/diff/80001/chrome/chrome_bro...
File chrome/chrome_browser_extensions.gypi (left):

https://chromiumcodereview.appspot.com/434613003/diff/80001/chrome/chrome_bro...
chrome/chrome_browser_extensions.gypi:1018:
'<@(chrome_browser_extensions_extensions_sources)',
On 2014/08/06 23:04:12, Yoyo Zhou wrote:
> Is this intentional?

Yes, I removed the variable above and moved all of its files to
chrome_browser_extensions_enabled_sources.

[Lei Zhang, 2014-08-07 00:00:42]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-07 00:02:18]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/434613003/100001

[commit-bot: I haz the power, 2014-08-07 07:37:01]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-07 07:37:03]

Failed to apply patch for chrome/browser/chrome_content_browser_client.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chrome_content_browser_client.cc
  Hunk #2 FAILED at 34.
  Hunk #3 succeeded at 218 (offset 1 line).
  Hunk #4 succeeded at 257 (offset 1 line).
  Hunk #5 succeeded at 266 (offset 1 line).
  Hunk #6 succeeded at 584 (offset -16 lines).
  Hunk #7 succeeded at 855 (offset -16 lines).
  Hunk #8 succeeded at 882 (offset -16 lines).
  Hunk #9 succeeded at 940 (offset -16 lines).
  Hunk #10 succeeded at 1002 (offset -16 lines).
  Hunk #11 succeeded at 1034 (offset -16 lines).
  Hunk #12 succeeded at 1072 (offset -16 lines).
  Hunk #13 succeeded at 1109 (offset -16 lines).
  1 out of 13 hunks FAILED -- saving rejects to file
chrome/browser/chrome_content_browser_client.cc.rej

Patch:       chrome/browser/chrome_content_browser_client.cc
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc
b/chrome/browser/chrome_content_browser_client.cc
index
f6553c3e8370a3fa1221f398a8862494add9d927..c7237be14b43c3a84dc2c4580cceea394bed0a7d
100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
+#include "chrome/browser/chrome_content_browser_client_parts.h"
 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
 #include "chrome/browser/chrome_quota_permission_context.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
@@ -33,7 +34,6 @@
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #include "chrome/browser/download/download_prefs.h"
-#include
"chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
 #include "chrome/browser/geolocation/chrome_access_token_store.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
@@ -216,6 +216,7 @@
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
+#include
"chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
@@ -254,7 +255,6 @@ using content::SiteInstance;
 using content::WebContents;
 using content::WebPreferences;
 using extensions::APIPermission;
-using extensions::ChromeContentBrowserClientExtensionsPart;
 using extensions::Extension;
 using extensions::InfoMap;
 using extensions::Manifest;
@@ -264,6 +264,10 @@ using message_center::NotifierId;
 using content::FileDescriptorInfo;
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
+using extensions::ChromeContentBrowserClientExtensionsPart;
+#endif
+
 namespace {
 
 // Cached version of the locale so we can return the locale on the I/O
@@ -595,7 +599,9 @@ ChromeContentBrowserClient::ChromeContentBrowserClient()
   TtsController::GetInstance()->SetTtsEngineDelegate(tts_extension_engine);
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
   extra_parts_.push_back(new ChromeContentBrowserClientExtensionsPart);
+#endif
 }
 
 ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -864,8 +870,12 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
     return GetEffectiveURLForSignin(url);
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::GetEffectiveURL(
       profile, url);
+#else
+  return url;
+#endif
 }
 
 bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
@@ -887,8 +897,12 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
     return true;
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::ShouldUseProcessPerSite(
       profile, effective_url);
+#else
+  return false;
+#endif
 }
 
 // These are treated as WebUI schemes but do not get WebUI bindings. Also,
@@ -941,18 +955,24 @@ bool ChromeContentBrowserClient::IsHandledURL(const GURL&
url) {
 bool ChromeContentBrowserClient::CanCommitURL(
     content::RenderProcessHost* process_host,
     const GURL& url) {
+#if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::CanCommitURL(
       process_host, url);
+#else
+  return true;
+#endif
 }
 
 bool ChromeContentBrowserClient::ShouldAllowOpenURL(
     content::SiteInstance* site_instance, const GURL& url) {
   GURL from_url = site_instance->GetSiteURL();
 
+#if defined(ENABLE_EXTENSIONS)
   bool result;
   if (ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
       site_instance, from_url, url, &result))
     return result;
+#endif
 
   // Do not allow chrome://chrome-signin navigate to other chrome:// URLs,
since
   // the signin page may host untrusted web content.
@@ -997,8 +1017,12 @@ bool ChromeContentBrowserClient::IsSuitableHost(
     return SigninManager::IsWebBasedSigninFlowURL(site_url);
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::IsSuitableHost(
       profile, process_host, site_url);
+#else
+  return true;
+#endif
 }
 
 bool ChromeContentBrowserClient::MayReuseHost(
@@ -1025,10 +1049,14 @@ bool
ChromeContentBrowserClient::ShouldTryToUseExistingProcessHost(
   if (!url.is_valid())
     return false;
 
+#if defined(ENABLE_EXTENSIONS)
   Profile* profile = Profile::FromBrowserContext(browser_context);
   return ChromeContentBrowserClientExtensionsPart::
       ShouldTryToUseExistingProcessHost(
           profile, url);
+#else
+  return false;
+#endif
 }
 
 void ChromeContentBrowserClient::SiteInstanceGotProcess(
@@ -1059,7 +1087,9 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
         ChromeSigninClientFactory::GetForProfile(profile);
     if (signin_client)
       signin_client->SetSigninProcess(site_instance->GetProcess()->GetID());
+#if defined(ENABLE_EXTENSIONS)
     ChromeContentBrowserClientExtensionsPart::SetSigninProcess(site_instance);
+#endif
   }
 #endif
 
@@ -1094,9 +1124,13 @@ bool
ChromeContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
     SiteInstance* site_instance,
     const GURL& current_url,
     const GURL& new_url) {
+#if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::
       ShouldSwapBrowsingInstancesForNavigation(
           site_instance, current_url, new_url);
+#else
+  return false;
+#endif
 }
 
 bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect(

[Lei Zhang, 2014-08-07 18:16:10]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-07 18:23:34]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/434613003/120001

[commit-bot: I haz the power, 2014-08-08 01:01:32]

Change committed as 288184