diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 21:45:16 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 21:45:16 +0000 |
| commit | b09505afecd3407aef9603f38907b01eb78222e5 (patch) | |
| tree | ab94a9809b192a5b3dd50ceadde0047f2e1f3bc6 /content/shell | |
| parent | fae8b9ec3e7d0246009dc5b4833fcd727d1ece2d (diff) | |
| download | chromium_src-b09505afecd3407aef9603f38907b01eb78222e5.zip chromium_src-b09505afecd3407aef9603f38907b01eb78222e5.tar.gz chromium_src-b09505afecd3407aef9603f38907b01eb78222e5.tar.bz2 | |
Revert 161634 - [content shell] allow universal access from file URLs in layout tests
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
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_main_delegate.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index 97ad101..ad1abcc 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -88,8 +88,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( switches::kForceCompositingMode); |