Remove dependency of chrome in WebRequestPermissions.

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

Index: chrome/browser/extensions/api/web_request/web_request_permissions.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
index 1de33ff118f4419f5b6da05c3a6c619977064bf5..5aacf0df2df7dad1529fadcea54a41b0a5a7872a 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
@@ -6,9 +6,9 @@
 
 #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"
@@ -21,6 +21,11 @@ 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.
@@ -60,8 +65,8 @@ bool IsSensitiveURL(const GURL& url) {
   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
@@ -91,8 +96,9 @@ bool WebRequestPermissions::HideRequest(
 
     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;
     }
   }