Use default CSP for resource loading in webview (instead of platform app's CSP)

chrome/browser/extensions/chrome_extensions_browser_client.cc

Index: chrome/browser/extensions/chrome_extensions_browser_client.cc
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 2fe1e3580ad31e14ab30c3874cf26f006e5be2ec..6b0bb5cc895036f592892a93393f21c154d89aba 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -15,6 +15,7 @@
 #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_renderer_state.h"

[James Cook, 2014/04/15 22:38:38]

Remove this include and the one below.

[lazyboy, 2014/04/15 22:42:00]

Done.

 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/url_request_util.h"
@@ -27,6 +28,7 @@
 #include "chrome/common/extensions/api/generated_api.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/resource_request_info.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/pref_names.h"
@@ -113,6 +115,11 @@ 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,