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

Side by Side Diff: chrome/test/ui/ui_test.cc

Issue 648003: Flip the "unique file:// URI origin" flag to on. Add the... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 10 years, 10 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 unified diff | Download patch
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/ui/ui_test.h" 5 #include "chrome/test/ui/ui_test.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/sql/connection.h" 10 #include "app/sql/connection.h"
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 command_line.AppendSwitch(switches::kDumpHistogramsOnExit); 1130 command_line.AppendSwitch(switches::kDumpHistogramsOnExit);
1131 1131
1132 #ifdef WAIT_FOR_DEBUGGER_ON_OPEN 1132 #ifdef WAIT_FOR_DEBUGGER_ON_OPEN
1133 command_line.AppendSwitch(switches::kDebugOnStart); 1133 command_line.AppendSwitch(switches::kDebugOnStart);
1134 #endif 1134 #endif
1135 1135
1136 if (!ui_test_name_.empty()) 1136 if (!ui_test_name_.empty())
1137 command_line.AppendSwitchWithValue(switches::kTestName, 1137 command_line.AppendSwitchWithValue(switches::kTestName,
1138 ui_test_name_); 1138 ui_test_name_);
1139 1139
1140 // The tests assume that file:// URIs can freely access other file:// URIs.
1141 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
1142
1140 DebugFlags::ProcessDebugFlags( 1143 DebugFlags::ProcessDebugFlags(
1141 &command_line, ChildProcessInfo::UNKNOWN_PROCESS, false); 1144 &command_line, ChildProcessInfo::UNKNOWN_PROCESS, false);
1142 command_line.AppendArguments(arguments, false); 1145 command_line.AppendArguments(arguments, false);
1143 1146
1144 // TODO(phajdan.jr): Only run it for "main" browser launch. 1147 // TODO(phajdan.jr): Only run it for "main" browser launch.
1145 browser_launch_time_ = TimeTicks::Now(); 1148 browser_launch_time_ = TimeTicks::Now();
1146 1149
1147 #if defined(OS_WIN) 1150 #if defined(OS_WIN)
1148 bool started = base::LaunchApp(command_line, 1151 bool started = base::LaunchApp(command_line,
1149 wait, 1152 wait,
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 set_ui_test_name(ASCIIToWide(test_name)); 1489 set_ui_test_name(ASCIIToWide(test_name));
1487 } 1490 }
1488 UITestBase::SetUp(); 1491 UITestBase::SetUp();
1489 PlatformTest::SetUp(); 1492 PlatformTest::SetUp();
1490 } 1493 }
1491 1494
1492 void UITest::TearDown() { 1495 void UITest::TearDown() {
1493 UITestBase::TearDown(); 1496 UITestBase::TearDown();
1494 PlatformTest::TearDown(); 1497 PlatformTest::TearDown();
1495 } 1498 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698