chrome/test/perf/frame_rate/frame_rate_tests.cc - Issue 7185023: Support Chromium-branded builds and cleanup reference build usage.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/perf/frame_rate/frame_rate_tests.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 side-by-side diff with in-line comments

Download patch

« chrome/test/memory_test/memory_test.cc ('K') | « chrome/test/page_cycler/page_cycler_test.cc ('k') | chrome/test/ui/dromaeo_benchmark_uitest.cc » ('j') | chrome/test/url_fetch_test/url_fetch_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/perf/frame_rate/frame_rate_tests.cc

diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc

index aa1224d4ce72684c14e5cdf2d1707140f99bc471..52e7de4453113842aa73cbd559bfec545afbc535 100644

--- a/chrome/test/perf/frame_rate/frame_rate_tests.cc

+++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc

@@ -79,20 +79,8 @@ class FrameRateTest : public UIPerfTest {

class FrameRateTest_Reference : public FrameRateTest {

public:

- // Override the browser directory that is used by UITest::SetUp to cause it

- // to use the reference build instead.

void SetUp() {

- FilePath dir;

- PathService::Get(chrome::DIR_TEST_TOOLS, &dir);

- dir = dir.AppendASCII("reference_build");

-#if defined(OS_WIN)

- dir = dir.AppendASCII("chrome");

-#elif defined(OS_LINUX)

- dir = dir.AppendASCII("chrome_linux");

-#elif defined(OS_MACOSX)

- dir = dir.AppendASCII("chrome_mac");

-#endif

- browser_directory_ = dir;

+ UseReferenceBuild();

FrameRateTest::SetUp();

}

};