Remove dependency of chrome in WebRequestPermissions.

chrome/browser/extensions/api/web_request/web_request_permissions.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/url_constants.h"
 #include "content/public/browser/resource_request_info.h"
+#include "extensions/browser/api/extensions_api_client.h"
+#include "extensions/browser/api/web_request/web_request_permissions_delegate.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 using content::ResourceRequestInfo;
 
 namespace {
 
+extensions::WebRequestPermissionsDelegate* GetWebRequestPermissionsDelegate() {

[Fady Samuel, 2014/08/27 21:49:17]

This is VERY bad. You're creating a new delegate every time you call
GetWebRequestPermissionsDelegate().

I don't think you need a delegate here at all. Could you simply hang this
directly off ExtensionsAPIClient? That's already a singleton.

+  return extensions::ExtensionsAPIClient::Get()->
+      CreateWebRequestPermissionsDelegate();
+}
+
 // Returns true if the URL is sensitive and requests to this URL must not be
 // modified/canceled by extensions, e.g. because it is targeted to the webstore
 // to check for updates, extension blacklisting, etc.
 bool IsSensitiveURL(const GURL& url) {
   // TODO(battre) Merge this, CanExtensionAccessURL and
   // PermissionsData::CanAccessPage into one function.
   bool sensitive_chrome_url = false;
   const std::string host = url.host();
   const char kGoogleCom[] = ".google.com";
   const char kClient[] = "clients";
@@ skipping 19 matching lines @@
         EndsWith(url.host(), ".clients.google.com", true) ||
         url.host() == "sb-ssl.google.com" ||
         (url.host() ==  "chrome.google.com" &&
              StartsWithASCII(url.path(), "/webstore", true));
   }
   GURL::Replacements replacements;
   replacements.ClearQuery();
   replacements.ClearRef();
   GURL url_without_query = url.ReplaceComponents(replacements);
   return sensitive_chrome_url ||
-      extension_urls::IsWebstoreUpdateUrl(url_without_query) ||
-      extension_urls::IsBlacklistUpdateUrl(url);
+      (GetWebRequestPermissionsDelegate() &&
+      GetWebRequestPermissionsDelegate()->IsUpdateURL(url));

[Fady Samuel, 2014/08/27 21:49:17]

Indent off.

 }
 
 // Returns true if the scheme is one we want to allow extensions to have access
 // to. Extensions still need specific permissions for a given URL, which is
 // covered by CanExtensionAccessURL.
 bool HasWebRequestScheme(const GURL& url) {
   return (url.SchemeIs(url::kAboutScheme) || url.SchemeIs(url::kFileScheme) ||
           url.SchemeIs(url::kFileSystemScheme) ||
           url.SchemeIs(url::kFtpScheme) || url.SchemeIs(url::kHttpScheme) ||
           url.SchemeIs(url::kHttpsScheme) ||
           url.SchemeIs(extensions::kExtensionScheme));
 }
 
 }  // namespace
 
 // static
 bool WebRequestPermissions::HideRequest(
     const extensions::InfoMap* extension_info_map,
     const net::URLRequest* request) {
   // Hide requests from the Chrome WebStore App or signin process.
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   if (info) {
     int process_id = info->GetChildID();
     // Never hide requests from guest processes.
     if (extensions::WebViewRendererState::GetInstance()->IsGuest(process_id))
       return false;
 
     if (extension_info_map && (
         extension_info_map->IsSigninProcess(process_id) ||
-        extension_info_map->process_map().Contains(
-            extension_misc::kWebStoreAppId, process_id))) {
+        (GetWebRequestPermissionsDelegate() &&
+        GetWebRequestPermissionsDelegate()->ContainsWebStoreAppId(

[Fady Samuel, 2014/08/27 21:49:17]

Indent off.

+            extension_info_map->process_map(), process_id)))) {
       return true;
     }
   }
 
   const GURL& url = request->url();
   return IsSensitiveURL(url) || !HasWebRequestScheme(url);
 }
 
 // static
 bool WebRequestPermissions::CanExtensionAccessURL(
@@ skipping 28 matching lines @@
       }
       break;
     case REQUIRE_ALL_URLS:
       if (!extension->permissions_data()->HasEffectiveAccessToAllHosts())
         return false;
       break;
   }
 
   return true;
 }