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

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

Issue 7185023: Support Chromium-branded builds and cleanup reference build usage. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed inherited method calls and updated two tests. 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
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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 true /* important */); 251 true /* important */);
252 } 252 }
253 253
254 void RunTest(const char* graph, const char* name, bool use_http) { 254 void RunTest(const char* graph, const char* name, bool use_http) {
255 RunTestWithSuffix(graph, name, use_http, ""); 255 RunTestWithSuffix(graph, name, use_http, "");
256 } 256 }
257 }; 257 };
258 258
259 class PageCyclerReferenceTest : public PageCyclerTest { 259 class PageCyclerReferenceTest : public PageCyclerTest {
260 public: 260 public:
261 // override the browser directory that is used by UITest::SetUp to cause it
262 // to use the reference build instead.
263 void SetUp() { 261 void SetUp() {
264 FilePath dir; 262 UseReferenceBuild();
265 PathService::Get(chrome::DIR_TEST_TOOLS, &dir);
266 dir = dir.AppendASCII("reference_build");
267 #if defined(OS_WIN)
268 dir = dir.AppendASCII("chrome");
269 #elif defined(OS_LINUX)
270 dir = dir.AppendASCII("chrome_linux");
271 #elif defined(OS_MACOSX)
272 dir = dir.AppendASCII("chrome_mac");
273 #endif
274 browser_directory_ = dir;
275 PageCyclerTest::SetUp(); 263 PageCyclerTest::SetUp();
276 } 264 }
277 265
278 void RunTest(const char* graph, const char* name, bool use_http) { 266 void RunTest(const char* graph, const char* name, bool use_http) {
279 // Run the test. 267 // Run the test.
280 PageCyclerTest::RunTestWithSuffix(graph, name, use_http, "_ref"); 268 PageCyclerTest::RunTestWithSuffix(graph, name, use_http, "_ref");
281 } 269 }
282 }; 270 };
283 271
284 class PageCyclerExtensionTest : public PageCyclerTest { 272 class PageCyclerExtensionTest : public PageCyclerTest {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 PAGE_CYCLER_DATABASE_TESTS("delete-transactions", 531 PAGE_CYCLER_DATABASE_TESTS("delete-transactions",
544 DeleteTransactions); 532 DeleteTransactions);
545 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions", 533 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions",
546 PseudoRandomTransactions); 534 PseudoRandomTransactions);
547 #endif 535 #endif
548 536
549 // Indexed DB tests. 537 // Indexed DB tests.
550 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert); 538 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert);
551 539
552 } // namespace 540 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698