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

Side by Side Diff: chrome/test/page_cycler/page_cycler_test.cc

Issue 7329007: Don't perform the default browser check when running the page cycler. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 if (parsed_command_line.HasSwitch(switches::kPageCyclerIterations)) { 131 if (parsed_command_line.HasSwitch(switches::kPageCyclerIterations)) {
132 std::string str = parsed_command_line.GetSwitchValueASCII( 132 std::string str = parsed_command_line.GetSwitchValueASCII(
133 switches::kPageCyclerIterations); 133 switches::kPageCyclerIterations);
134 base::StringToInt(str, &num_test_iterations_); 134 base::StringToInt(str, &num_test_iterations_);
135 } 135 }
136 136
137 // Expose garbage collection for the page cycler tests. 137 // Expose garbage collection for the page cycler tests.
138 launch_arguments_.AppendSwitchASCII(switches::kJavaScriptFlags, 138 launch_arguments_.AppendSwitchASCII(switches::kJavaScriptFlags,
139 "--expose_gc"); 139 "--expose_gc");
140 launch_arguments_.AppendSwitch(switches::kNoDefaultBrowserCheck);
Paweł Hajdan Jr. 2011/07/19 20:32:16 Is this needed? I think test_launcher_utils alread
abarth-chromium 2011/07/19 21:34:37 This CL can be reverted. It didn't help.
Paweł Hajdan Jr. 2011/07/21 18:28:27 Okay, I'm doing that: http://codereview.chromium.o
140 } 141 }
141 142
142 void SetUp() { 143 void SetUp() {
143 UITest::SetUp(); 144 UITest::SetUp();
Paweł Hajdan Jr. 2011/07/19 20:32:16 I think that might be a problem - it seems like it
abarth-chromium 2011/07/19 21:34:37 Dunno, could be. That seems unrelated to this pat
144 } 145 }
145 146
146 virtual FilePath GetDataPath(const char* name) { 147 virtual FilePath GetDataPath(const char* name) {
147 // Make sure the test data is checked out 148 // Make sure the test data is checked out
148 FilePath test_path; 149 FilePath test_path;
149 PathService::Get(base::DIR_SOURCE_ROOT, &test_path); 150 PathService::Get(base::DIR_SOURCE_ROOT, &test_path);
150 test_path = test_path.Append(FILE_PATH_LITERAL("data")); 151 test_path = test_path.Append(FILE_PATH_LITERAL("data"));
151 test_path = test_path.Append(FILE_PATH_LITERAL("page_cycler")); 152 test_path = test_path.Append(FILE_PATH_LITERAL("page_cycler"));
152 test_path = test_path.AppendASCII(name); 153 test_path = test_path.AppendASCII(name);
153 return test_path; 154 return test_path;
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 PAGE_CYCLER_DATABASE_TESTS("delete-transactions", 532 PAGE_CYCLER_DATABASE_TESTS("delete-transactions",
532 DeleteTransactions); 533 DeleteTransactions);
533 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions", 534 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions",
534 PseudoRandomTransactions); 535 PseudoRandomTransactions);
535 #endif 536 #endif
536 537
537 // Indexed DB tests. 538 // Indexed DB tests.
538 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert); 539 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert);
539 540
540 } // namespace 541 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698