Android: Remove web_request extension API.

BUG=305852

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

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

chrome/browser/chrome_content_browser_client.cc

@@ -32,7 +32,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/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/browser_permissions_policy_delegate.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -232,6 +231,7 @@
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/guest_view/guest_view_base.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
@@ -963,7 +963,9 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
   host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
       profile->IsOffTheRecord()));
 
+#if defined(ENABLE_EXTENSIONS)
   SendExtensionWebRequestStatusToHost(host);
+#endif
 
   RendererContentSettingRules rules;
   if (host->IsIsolatedGuest()) {

chrome/browser/extensions/chrome_extensions_browser_client.cc

@@ -13,7 +13,6 @@
 #include "chrome/browser/extensions/api/preference/chrome_direct_setting.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
 #include "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h"
-#include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/chrome_app_sorting.h"
 #include "chrome/browser/extensions/chrome_extension_host_delegate.h"
 #include "chrome/browser/extensions/extension_system_factory.h"

chrome/browser/net/chrome_extensions_network_delegate.h

+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_NET_CHROME_EXTENSIONS_NETWORK_DELEGATE_H_
+#define CHROME_BROWSER_NET_CHROME_EXTENSIONS_NETWORK_DELEGATE_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
+#include "net/base/network_delegate.h"
+
+namespace extensions {
+class EventRouterForwarder;
+class InfoMap;
+}
+
+// ChromeExtensionsNetworkDelegate is the extensions-only portion of
+// ChromeNetworkDelegate. When extensions are disabled, do nothing.
+class ChromeExtensionsNetworkDelegate : public net::NetworkDelegate {
+ public:
+  static ChromeExtensionsNetworkDelegate* Create(
+      extensions::EventRouterForwarder* event_router);
+
+  virtual ~ChromeExtensionsNetworkDelegate();
+
+  // Not inlined because we assign a scoped_refptr, which requires us to include
+  // the header file.
+  void set_extension_info_map(extensions::InfoMap* extension_info_map);
+
+  // If |profile| is NULL or not set, events will be broadcast to all profiles,
+  // otherwise they will only be sent to the specified profile.
+  void set_profile(void* profile) {
+    profile_ = profile;
+  }
+
+  // If the |request| failed due to problems with a proxy, forward the error to
+  // the proxy extension API.
+  virtual void ForwardProxyErrors(net::URLRequest* request);
+
+  // Notifies the extensions::ProcessManager for the associated RenderFrame, if
+  // any, that a request has started or stopped.
+  virtual void ForwardStartRequestStatus(net::URLRequest* request);
+  virtual void ForwardDoneRequestStatus(net::URLRequest* request);
+
+  // NetworkDelegate implementation.
+  virtual int OnBeforeURLRequest(net::URLRequest* request,
+                                 const net::CompletionCallback& callback,
+                                 GURL* new_url) OVERRIDE;
+  virtual int OnBeforeSendHeaders(net::URLRequest* request,
+                                  const net::CompletionCallback& callback,
+                                  net::HttpRequestHeaders* headers) OVERRIDE;
+  virtual void OnSendHeaders(net::URLRequest* request,
+                             const net::HttpRequestHeaders& headers) OVERRIDE;
+  virtual int OnHeadersReceived(
+      net::URLRequest* request,
+      const net::CompletionCallback& callback,
+      const net::HttpResponseHeaders* original_response_headers,
+      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
+      GURL* allowed_unsafe_redirect_url) OVERRIDE;
+  virtual void OnBeforeRedirect(net::URLRequest* request,
+                                const GURL& new_location) OVERRIDE;
+  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+  virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE;
+  virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE;
+  virtual void OnPACScriptError(int line_number,
+                                const base::string16& error) OVERRIDE;
+  virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
+      net::URLRequest* request,
+      const net::AuthChallengeInfo& auth_info,
+      const AuthCallback& callback,
+      net::AuthCredentials* credentials) OVERRIDE;
+
+ protected:
+  ChromeExtensionsNetworkDelegate();
+
+  void* profile_;
+
+#if defined(ENABLE_EXTENSIONS)
+  scoped_refptr<extensions::InfoMap> extension_info_map_;
+#endif
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsNetworkDelegate);
+};
+
+#endif  // CHROME_BROWSER_NET_CHROME_EXTENSIONS_NETWORK_DELEGATE_H_

chrome/browser/net/chrome_network_delegate.h

@@ -16,6 +16,7 @@
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_metrics.h"
 #include "net/base/network_delegate.h"
 
+class ChromeExtensionsNetworkDelegate;
 class ClientHints;
 class CookieSettings;
 class PrefService;
@@ -68,20 +69,20 @@ class ChromeNetworkDelegate : public net::NetworkDelegate {
                         BooleanPrefMember* enable_referrers);
   virtual ~ChromeNetworkDelegate();
 
-  // Not inlined because we assign a scoped_refptr, which requires us to include
-  // the header file.
+  // Pass through to ChromeExtensionsNetworkDelegate::set_extension_info_map().
   void set_extension_info_map(extensions::InfoMap* extension_info_map);
 
+#if defined(ENABLE_CONFIGURATION_POLICY)
   void set_url_blacklist_manager(
       const policy::URLBlacklistManager* url_blacklist_manager) {
     url_blacklist_manager_ = url_blacklist_manager;
   }
+#endif
 
   // If |profile| is NULL or not set, events will be broadcast to all profiles,
   // otherwise they will only be sent to the specified profile.
-  void set_profile(void* profile) {
-    profile_ = profile;
-  }
+  // Also pass through to ChromeExtensionsNetworkDelegate::set_profile().
+  void set_profile(void* profile);
 
   // |profile_path| is used to locate the "Downloads" folder on Chrome OS. If it
   // is set, the location of the Downloads folder for the profile is added to
@@ -109,9 +110,8 @@ class ChromeNetworkDelegate : public net::NetworkDelegate {
   }
 
   void set_domain_reliability_monitor(
-      domain_reliability::DomainReliabilityMonitor*
-          domain_reliability_monitor) {
-    domain_reliability_monitor_ = domain_reliability_monitor;
+      domain_reliability::DomainReliabilityMonitor* monitor) {
+    domain_reliability_monitor_ = monitor;
   }
 
   void set_prerender_tracker(prerender::PrerenderTracker* prerender_tracker) {
@@ -205,13 +205,12 @@ class ChromeNetworkDelegate : public net::NetworkDelegate {
       int64 original_payload_byte_count,
       data_reduction_proxy::DataReductionProxyRequestType request_type);
 
-  scoped_refptr<extensions::EventRouterForwarder> event_router_;
+  scoped_ptr<ChromeExtensionsNetworkDelegate> extensions_delegate_;
+
   void* profile_;
   base::FilePath profile_path_;
   scoped_refptr<CookieSettings> cookie_settings_;
 
-  scoped_refptr<extensions::InfoMap> extension_info_map_;
-
   scoped_ptr<chrome_browser_net::ConnectInterceptor> connect_interceptor_;
 
   // Weak, owned by our owner.
@@ -220,7 +219,9 @@ class ChromeNetworkDelegate : public net::NetworkDelegate {
   BooleanPrefMember* force_google_safe_search_;
 
   // Weak, owned by our owner.
+#if defined(ENABLE_CONFIGURATION_POLICY)
   const policy::URLBlacklistManager* url_blacklist_manager_;
+#endif
   domain_reliability::DomainReliabilityMonitor* domain_reliability_monitor_;
 
   // When true, allow access to all file:// URLs.

chrome/browser/profiles/off_the_record_profile_impl.cc

@@ -20,7 +20,6 @@
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/io_thread.h"
@@ -74,10 +73,15 @@
 #include "chrome/browser/guest_view/guest_view_manager.h"
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/api/web_request/web_request_api.h"
+#endif
+
 using content::BrowserThread;
 using content::DownloadManagerDelegate;
 using content::HostZoomMap;
 
+#if defined(ENABLE_EXTENSIONS)
 namespace {
 
 void NotifyOTRProfileCreatedOnIOThread(void* original_profile,
@@ -93,6 +97,7 @@ void NotifyOTRProfileDestroyedOnIOThread(void* original_profile,
 }
 
 }  // namespace
+#endif
 
 OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)
     : profile_(real_profile),
@@ -148,9 +153,11 @@ void OffTheRecordProfileImpl::Init() {
       io_data_->GetResourceContextNoInit());
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&NotifyOTRProfileCreatedOnIOThread, profile_, this));
+#endif
 }
 
 OffTheRecordProfileImpl::~OffTheRecordProfileImpl() {
@@ -164,9 +171,11 @@ OffTheRecordProfileImpl::~OffTheRecordProfileImpl() {
   BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
       this);
 
+#if defined(ENABLE_EXTENSIONS)
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&NotifyOTRProfileDestroyedOnIOThread, profile_, this));
+#endif
 
   if (host_content_settings_map_.get())
     host_content_settings_map_->ShutdownOnUIThread();

chrome/chrome_browser.gypi

@@ -1216,6 +1216,8 @@
         'browser/net/async_dns_field_trial.cc',
         'browser/net/async_dns_field_trial.h',
         'browser/net/chrome_cookie_notification_details.h',
+        'browser/net/chrome_extensions_network_delegate.cc',
+        'browser/net/chrome_extensions_network_delegate.h',
         'browser/net/chrome_fraudulent_certificate_reporter.cc',
         'browser/net/chrome_fraudulent_certificate_reporter.h',
         'browser/net/chrome_http_user_agent_settings.cc',

chrome/chrome_browser_extensions.gypi

@@ -1041,16 +1041,6 @@
             ['include', '^browser/extensions/api/content_settings/content_settings_api_constants.cc'],
             ['include', '^browser/extensions/api/content_settings/content_settings_helpers.cc'],
             ['include', '^browser/extensions/api/content_settings/content_settings_store.cc'],
-            ['include', '^browser/extensions/api/declarative/rules_registry_service.cc'],
-            ['include', '^browser/extensions/api/declarative/rules_registry_with_cache.cc'],
-            ['include', '^browser/extensions/api/declarative/substring_set_matcher.cc'],
-            ['include', '^browser/extensions/api/declarative/url_matcher.cc'],
-            ['include', '^browser/extensions/api/declarative_webrequest/request_stage.cc'],
-            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_action.cc'],
-            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_condition.cc'],
-            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc'],
-            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_constants.cc'],
-            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc'],
             ['include', '^browser/extensions/api/extension_action/extension_action_api.cc'],
             ['include', '^browser/extensions/api/extension_action/extension_page_actions_api_constants.cc'],
             ['include', '^browser/extensions/api/messaging/extension_message_port.cc'],
@@ -1068,13 +1058,6 @@
             ['include', '^browser/extensions/api/web_navigation/web_navigation_api.cc'],
             ['include', '^browser/extensions/api/web_navigation/web_navigation_api_constants.cc'],
             ['include', '^browser/extensions/api/web_navigation/web_navigation_api_helpers.cc'],
-            ['include', '^browser/extensions/api/web_request/form_data_parser.cc'],
-            ['include', '^browser/extensions/api/web_request/upload_data_presenter.cc'],
-            ['include', '^browser/extensions/api/web_request/web_request_api.cc'],
-            ['include', '^browser/extensions/api/web_request/web_request_api_constants.cc'],
-            ['include', '^browser/extensions/api/web_request/web_request_api_helpers.cc'],
-            ['include', '^browser/extensions/api/web_request/web_request_permissions.cc'],
-            ['include', '^browser/extensions/api/web_request/web_request_time_tracker.cc'],
           ],
           'dependencies!': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',

chrome/common/extensions/api/api.gyp

@@ -20,20 +20,20 @@
         'chromium_code': 1,
         # Disable schema compiler to generate model extension API code.
         # Only register the extension functions in extension system.
-        'non_compiled_schema_files': [
-          'browsing_data.json',
-          'chromeos_info_private.json',
-          'extension.json',
-          'idltest.idl',
-          'infobars.json',
-          'media_player_private.json',
-          'music_manager_private.idl',
-          'principals_private.idl',
-          'top_sites.json',
-          'web_request_internal.json',
-        ],
         'conditions': [
           ['OS!="android"', {
+            'non_compiled_schema_files': [
+              'browsing_data.json',
+              'chromeos_info_private.json',
+              'extension.json',
+              'idltest.idl',
+              'infobars.json',
+              'media_player_private.json',
+              'music_manager_private.idl',
+              'principals_private.idl',
+              'top_sites.json',
+              'web_request_internal.json',
+            ],
             'schema_files': [
               'accessibility_private.json',
               'activity_log_private.json',
@@ -135,22 +135,23 @@
               'windows.json',
             ],
           }, {  # OS=="android"
-              'schema_files': [
-                # These should be eliminated. See crbug.com/305852.
-                'activity_log_private.json',
-                'events.json',
-                'file_system.idl',
-                'manifest_types.json',
-                'permissions.json',
-                'sync_file_system.idl',
-                'tab_capture.idl',
-                'tabs.json',
-                'types.json',
-                'webview.json',
-                'web_navigation.json',
-                'web_request.json',
-                'windows.json',
-              ],
+            'non_compiled_schema_files': [
+            ],
+            'schema_files': [
+              # These should be eliminated. See crbug.com/305852.
+              'activity_log_private.json',
+              'events.json',
+              'file_system.idl',
+              'manifest_types.json',
+              'permissions.json',
+              'sync_file_system.idl',
+              'tab_capture.idl',
+              'tabs.json',
+              'types.json',
+              'webview.json',
+              'web_navigation.json',
+              'windows.json',
+            ],
           }],
           ['chromeos==1', {
             'schema_files': [