The scheme granting code seems to become redundant, even for

multi-process mode.

Also, removed duplicate constant for the "content:" scheme.

BUG=516546

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

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

6 files changed, 5 insertions, 24 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 87a1b93..2ce63f6 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -160,20 +160,6 @@ AwContentBrowserClient::GetWebContentsViewDelegate(
 
 void AwContentBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
-  // If WebView becomes multi-process capable, this may be insecure.
-  // More benefit can be derived from the ChildProcessSecurotyPolicy by
-  // deferring the GrantScheme calls until we know that a given child process
-  // really does need that priviledge. Check here to ensure we rethink this
-  // when the time comes. See crbug.com/156062.
-  CHECK(content::RenderProcessHost::run_renderer_in_process());
-
-  // Grant content: and file: scheme to the whole process, since we impose
-  // per-view access checks.
-  content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
-      host->GetID(), android_webview::kContentScheme);
-  content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
-      host->GetID(), url::kFileScheme);
-
   host->AddFilter(new AwContentsMessageFilter(host->GetID()));
   host->AddFilter(new cdm::CdmMessageFilterAndroid());
   host->AddFilter(new AwPrintingMessageFilter(host->GetID()));
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index da8a604..577c355 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -152,7 +152,7 @@ bool IoThreadClientThrottle::ShouldBlockRequest() {
     return false;
 
   // Part of implementation of WebSettings.allowContentAccess.
-  if (request_->url().SchemeIs(android_webview::kContentScheme) &&
+  if (request_->url().SchemeIs(url::kContentScheme) &&
       io_client->ShouldBlockContentUrls()) {
     return true;
   }
diff --git a/android_webview/common/url_constants.cc b/android_webview/common/url_constants.cc
index b802be6..89a32bb 100644
--- a/android_webview/common/url_constants.cc
+++ b/android_webview/common/url_constants.cc
@@ -6,11 +6,6 @@
 
 namespace android_webview {
 
-// The content: scheme is used in Android for interacting with content
-// provides.
-// See http://developer.android.com/reference/android/content/ContentUris.html
-const char kContentScheme[] = "content";
-
 // These are special paths used with the file: scheme to access application
 // assets and resources.
 // See http://developer.android.com/reference/android/webkit/WebSettings.html
diff --git a/android_webview/common/url_constants.h b/android_webview/common/url_constants.h
index 39f4c8b..80c3571 100644
--- a/android_webview/common/url_constants.h
+++ b/android_webview/common/url_constants.h
@@ -9,7 +9,6 @@
 
 namespace android_webview {
 
-extern const char kContentScheme[];
 // Special Android file paths.
 extern const char kAndroidAssetPath[];
 extern const char kAndroidResourcePath[];
diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc
index b9f795a..dd4db90 100644
--- a/android_webview/native/android_protocol_handler.cc
+++ b/android_webview/native/android_protocol_handler.cc
@@ -22,6 +22,7 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"
 
 using android_webview::InputStream;
 using android_webview::InputStreamImpl;
@@ -267,7 +268,7 @@ ContentSchemeRequestInterceptor::ContentSchemeRequestInterceptor() {
 
 bool ContentSchemeRequestInterceptor::ShouldHandleRequest(
     const net::URLRequest* request) const {
-  return request->url().SchemeIs(android_webview::kContentScheme);
+  return request->url().SchemeIs(url::kContentScheme);
 }
 
 }  // namespace
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index f1ccc5d..9afbca9 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -33,6 +33,7 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"
 
 using content::RenderThread;
 
@@ -45,8 +46,7 @@ AwContentRendererClient::~AwContentRendererClient() {
 }
 
 void AwContentRendererClient::RenderThreadStarted() {
-  blink::WebString content_scheme(
-      base::ASCIIToUTF16(android_webview::kContentScheme));
+  blink::WebString content_scheme(base::ASCIIToUTF16(url::kContentScheme));
   blink::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme);
 
   blink::WebString aw_scheme(