Remove ExtensionAPIClient::IsWebViewRequest

This is a silly remnant of the extensions refactor. We go to chrome to go
back to extensions. This removes this API and calls IsWebViewRequest directly.

BUG=352293
TBR=sky@chromium.org for code deletion in chrome_extensions_browser_client

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

Cr-Commit-Position: refs/heads/master@{#295872}

chrome/browser/extensions/chrome_extensions_browser_client.cc

@@ -114,11 +114,6 @@ bool ChromeExtensionsBrowserClient::CanExtensionCrossIncognito(
       || util::CanCrossIncognito(extension, context);
 }
 
-bool ChromeExtensionsBrowserClient::IsWebViewRequest(
-    net::URLRequest* request) const {
-  return url_request_util::IsWebViewRequest(request);
-}
-
 net::URLRequestJob*
 ChromeExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
     net::URLRequest* request,

chrome/browser/extensions/chrome_extensions_browser_client.h

@@ -60,7 +60,6 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
   virtual bool CanExtensionCrossIncognito(
       const extensions::Extension* extension,
       content::BrowserContext* context) const OVERRIDE;
-  virtual bool IsWebViewRequest(net::URLRequest* request) const OVERRIDE;
   virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,

extensions/browser/extension_protocols.cc

@@ -37,6 +37,7 @@
 #include "extensions/browser/content_verify_job.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/info_map.h"
+#include "extensions/browser/url_request_util.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_resource.h"
@@ -430,7 +431,7 @@ ExtensionProtocolHandler::MaybeCreateJob(
     std::string resource_path = request->url().path();
 
     // Use default CSP for <webview>.
-    if (!ExtensionsBrowserClient::Get()->IsWebViewRequest(request)) {
+    if (!url_request_util::IsWebViewRequest(request)) {
       content_security_policy =
           extensions::CSPInfo::GetResourceContentSecurityPolicy(extension,
                                                                 resource_path);

extensions/browser/extensions_browser_client.h

@@ -101,10 +101,6 @@ class ExtensionsBrowserClient {
       const extensions::Extension* extension,
       content::BrowserContext* context) const = 0;
 
-  // Returns true if |request| corresponds to a resource request from a
-  // <webview>.
-  virtual bool IsWebViewRequest(net::URLRequest* request) const = 0;
-
   // Returns an URLRequestJob to load an extension resource from the embedder's
   // resource bundle (.pak) files. Returns NULL if the request is not for a
   // resource bundle resource or if the embedder does not support this feature.

extensions/browser/test_extensions_browser_client.cc

@@ -87,11 +87,6 @@ bool TestExtensionsBrowserClient::CanExtensionCrossIncognito(
   return false;
 }
 
-bool TestExtensionsBrowserClient::IsWebViewRequest(
-    net::URLRequest* request) const {
-  return false;
-}
-
 net::URLRequestJob*
 TestExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
     net::URLRequest* request,

extensions/browser/test_extensions_browser_client.h

@@ -49,7 +49,6 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
   virtual bool CanExtensionCrossIncognito(
       const extensions::Extension* extension,
       content::BrowserContext* context) const OVERRIDE;
-  virtual bool IsWebViewRequest(net::URLRequest* request) const OVERRIDE;
   virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,

extensions/shell/browser/shell_extensions_browser_client.cc

@@ -108,11 +108,6 @@ bool ShellExtensionsBrowserClient::CanExtensionCrossIncognito(
   return false;
 }
 
-bool ShellExtensionsBrowserClient::IsWebViewRequest(
-    net::URLRequest* request) const {
-  return false;
-}
-
 net::URLRequestJob*
 ShellExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
     net::URLRequest* request,

extensions/shell/browser/shell_extensions_browser_client.h

@@ -42,7 +42,6 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
   virtual bool CanExtensionCrossIncognito(
       const Extension* extension,
       content::BrowserContext* context) const OVERRIDE;
-  virtual bool IsWebViewRequest(net::URLRequest* request) const OVERRIDE;
   virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,