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

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

Issue 7171005: Always support locating Chromium-branded builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable chrome switching in UIPerfTest and PageCyclerReferenceTest Created 9 years, 6 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 | « chrome/common/chrome_constants.cc ('k') | chrome/test/ui/ui_perf_test.cc » ('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) 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 PathService::Get(chrome::DIR_TEST_TOOLS, &dir); 265 PathService::Get(chrome::DIR_TEST_TOOLS, &dir);
266 dir = dir.AppendASCII("reference_build"); 266 dir = dir.AppendASCII("reference_build");
267 #if defined(OS_WIN) 267 #if defined(OS_WIN)
268 dir = dir.AppendASCII("chrome"); 268 dir = dir.AppendASCII("chrome");
269 #elif defined(OS_LINUX) 269 #elif defined(OS_LINUX)
270 dir = dir.AppendASCII("chrome_linux"); 270 dir = dir.AppendASCII("chrome_linux");
271 #elif defined(OS_MACOSX) 271 #elif defined(OS_MACOSX)
272 dir = dir.AppendASCII("chrome_mac"); 272 dir = dir.AppendASCII("chrome_mac");
273 #endif 273 #endif
274 browser_directory_ = dir; 274 browser_directory_ = dir;
275 enable_chrome_branding_ = false;
275 PageCyclerTest::SetUp(); 276 PageCyclerTest::SetUp();
276 } 277 }
277 278
278 void RunTest(const char* graph, const char* name, bool use_http) { 279 void RunTest(const char* graph, const char* name, bool use_http) {
279 // Run the test. 280 // Run the test.
280 PageCyclerTest::RunTestWithSuffix(graph, name, use_http, "_ref"); 281 PageCyclerTest::RunTestWithSuffix(graph, name, use_http, "_ref");
281 } 282 }
282 }; 283 };
283 284
284 class PageCyclerExtensionTest : public PageCyclerTest { 285 class PageCyclerExtensionTest : public PageCyclerTest {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 PAGE_CYCLER_DATABASE_TESTS("delete-transactions", 544 PAGE_CYCLER_DATABASE_TESTS("delete-transactions",
544 DeleteTransactions); 545 DeleteTransactions);
545 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions", 546 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions",
546 PseudoRandomTransactions); 547 PseudoRandomTransactions);
547 #endif 548 #endif
548 549
549 // Indexed DB tests. 550 // Indexed DB tests.
550 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert); 551 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert);
551 552
552 } // namespace 553 } // namespace
OLDNEW
« no previous file with comments | « chrome/common/chrome_constants.cc ('k') | chrome/test/ui/ui_perf_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698