Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4743)

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 2385553002: Revert of Lock down the registration of blob:chrome-extension:// URLs (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_security_exploit_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index f01cf1c99c1ce20d112f9abd355c1e7423361395..3d002dad6f012a3bcbe1518e242a79e8630b9a7b 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -78,7 +78,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/chrome_extensions_client.h"
-#include "chrome/common/extensions/extension_process_policy.h"
#include "chrome/common/features.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/switch_utils.h"
@@ -221,22 +220,10 @@
net_log_path, GetNetCaptureModeFromCommandLine(command_line),
command_line.GetCommandLineString(), chrome::GetChannelString()));
-#if defined(ENABLE_EXTENSIONS)
- if (extensions::IsIsolateExtensionsEnabled()) {
- // chrome-extension:// URLs are safe to request anywhere, but may only
- // commit (including in iframes) in extension processes.
- ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeIsolatedScheme(
- extensions::kExtensionScheme, true);
- // TODO(nick): Kill off kExtensionResourceScheme.
- ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeIsolatedScheme(
- extensions::kExtensionResourceScheme, false);
- } else {
- ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
- extensions::kExtensionScheme);
- ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
- extensions::kExtensionResourceScheme);
- }
-#endif
+ ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
+ extensions::kExtensionScheme);
+ ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
+ extensions::kExtensionResourceScheme);
ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
chrome::kChromeSearchScheme);
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_security_exploit_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698