summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.cc
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 08:11:11 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 08:11:11 +0000
commitf4d5f5d8f0133f1684b4bb954e61e1e33480d6f5 (patch)
tree78390beccb810ec1df73be78c05bcec140ac82fe /chrome/test/ui/ui_test.cc
parent9087aa3c473281af9c216d060d00baa4e1af4216 (diff)
downloadchromium_src-f4d5f5d8f0133f1684b4bb954e61e1e33480d6f5.zip
chromium_src-f4d5f5d8f0133f1684b4bb954e61e1e33480d6f5.tar.gz
chromium_src-f4d5f5d8f0133f1684b4bb954e61e1e33480d6f5.tar.bz2
Flip the "unique file:// URI origin" flag to on. Add the
--allow-file-access-from-files developer switch. Turn on this flag for the UI tests, which depend on the old behaviour. BUG=4197 TEST=WebKit test submitted upstream TBR=abarth Review URL: http://codereview.chromium.org/648003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
-rw-r--r--chrome/test/ui/ui_test.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 152798d..12846c6 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -1137,6 +1137,9 @@ bool UITestBase::LaunchBrowserHelper(const CommandLine& arguments,
command_line.AppendSwitchWithValue(switches::kTestName,
ui_test_name_);
+ // The tests assume that file:// URIs can freely access other file:// URIs.
+ command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
+
DebugFlags::ProcessDebugFlags(
&command_line, ChildProcessInfo::UNKNOWN_PROCESS, false);
command_line.AppendArguments(arguments, false);