summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics/metrics_service_uitest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 22:21:50 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 22:21:50 +0000
commitb06ee4d8cbbced93e0faf03d6517f4279015ee5c (patch)
tree9be68daed31236c6d24c8fdb1c691de273a693ed /chrome/browser/metrics/metrics_service_uitest.cc
parentc9c16ab3dc14d9caf03665e359b713e8c21486ba (diff)
downloadchromium_src-b06ee4d8cbbced93e0faf03d6517f4279015ee5c.zip
chromium_src-b06ee4d8cbbced93e0faf03d6517f4279015ee5c.tar.gz
chromium_src-b06ee4d8cbbced93e0faf03d6517f4279015ee5c.tar.bz2
GTTF: Use a fresh TestingBrowserProcess for each test, part #6
For a detailed description see part #1, http://codereview.chromium.org/6478005/ This CL fixes the bug fully on Linux. More platforms will follow. BUG=61062 TEST=unit_tests, possibly more Review URL: http://codereview.chromium.org/7628006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_service_uitest.cc')
-rw-r--r--chrome/browser/metrics/metrics_service_uitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc
index 6d25efd..89dcb2e 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.