chrome/browser/metrics/metrics_service_uitest.cc - Issue 7628006: GTTF: Use a fresh TestingBrowserProcess for each test, part #6

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/browser/metrics/metrics_service_uitest.cc

Issue 7628006: GTTF: Use a fresh TestingBrowserProcess for each test, part #6 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes Created 9 years, 4 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:

Index: chrome/browser/metrics/metrics_service_uitest.cc

diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc

index 6d25efd441adcac761c4a1b07da7aa47bdce5d0b..89dcb2eab20f01a037d69af8a9fb77de7d73b4d7 100644

--- a/chrome/browser/metrics/metrics_service_uitest.cc

+++ b/chrome/browser/metrics/metrics_service_uitest.cc

@@ -57,7 +57,7 @@ class MetricsServiceTest : public UITest {

FilePath path = user_data_dir().Append(chrome::kLocalStateFilename);

return PrefServiceMockBuilder().WithUserFilePrefs(path).Create();

}

-#if defined(OS_WIN)

+#if defined(OS_WIN) || defined(OS_LINUX)

// This is not really Windows-specific, the transition is just being done

// in stages, and Windows is first. See below for more info.

// TODO(phajdan.jr): Remove #ifdef after fixing http://crbug.com/61062.