chromium/src
0
Fork 0
Code Activity

Revert 161634 - [content shell] allow universal access from file URLs in layout tests

Browse Source 
BUG=111316
TEST=compositing/iframes/iframe-in-composited-layer.html does not time out


Review URL: https://chromiumcodereview.appspot.com/11116013

TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/11139006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161659 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jochen@chromium.org
2012-10-12 21:45:16 +00:00
parent fae8b9ec3e
commit b09505afec
5 changed files with 0 additions and 11 deletions
chrome/browser/ui/startup
bad_flags_prompt.cc
content
browser
web_contents
web_contents_impl.cc
public
common
content_switches.cccontent_switches.h
shell
shell_main_delegate.cc

1
chrome/browser/ui/startup/bad_flags_prompt.cc

@ -25,7 +25,6 @@ void ShowBadFlagsPrompt(Browser* browser) {
switches::kNoSandbox,
switches::kInProcessWebGL,
switches::kDisableWebSecurity,
switches::kAllowUniversalAccessFromFiles,
// Browser plugin is dangerous on regular pages because it breaks the Same
// Origin Policy.
switches::kEnableBrowserPluginForAllViewTypes,

2
content/browser/web_contents/web_contents_impl.cc

@ -525,8 +525,6 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
command_line.HasSwitch(switches::kEnablePrivilegedWebGLExtensions);
prefs.site_specific_quirks_enabled =
!command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
prefs.allow_universal_access_from_file_urls =
command_line.HasSwitch(switches::kAllowUniversalAccessFromFiles);
prefs.allow_file_access_from_file_urls =
command_line.HasSwitch(switches::kAllowFileAccessFromFiles);
prefs.show_composited_layer_borders =

5
content/public/common/content_switches.cc

@ -10,11 +10,6 @@ namespace switches {
// override for developers who need the old behavior for testing.
const char kAllowFileAccessFromFiles[] = "allow-file-access-from-files";
// Explicitely grant the ability to access every other SecurityOrigin to
// file URLs. This is a security havoc and should only be used for testing.
const char kAllowUniversalAccessFromFiles[] =
"allow-universal-access-from-files";
// Allows debugging of sandboxed processes (see zygote_main_linux.cc).
const char kAllowSandboxDebugging[] = "allow-sandbox-debugging";

1
content/public/common/content_switches.h

@ -13,7 +13,6 @@
namespace switches {
CONTENT_EXPORT extern const char kAllowFileAccessFromFiles[];
CONTENT_EXPORT extern const char kAllowUniversalAccessFromFiles[];
extern const char kAllowSandboxDebugging[];
extern const char kAllowWebUICompositing[];
extern const char kAuditHandles[];

2
content/shell/shell_main_delegate.cc

@ -87,8 +87,6 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
InitLogging();
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowUniversalAccessFromFiles);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowFileAccessFromFiles);
CommandLine::ForCurrentProcess()->AppendSwitch(