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

Side by Side Diff: chrome/browser/metrics/metrics_service_uitest.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self review Created 9 years, 7 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 // Tests the MetricsService stat recording to make sure that the numbers are 5 // Tests the MetricsService stat recording to make sure that the numbers are
6 // what we expect. 6 // what we expect.
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 FilePath path = user_data_dir().Append(chrome::kLocalStateFilename); 55 FilePath path = user_data_dir().Append(chrome::kLocalStateFilename);
56 return PrefServiceMockBuilder().WithUserFilePrefs(path).Create(); 56 return PrefServiceMockBuilder().WithUserFilePrefs(path).Create();
57 } 57 }
58 }; 58 };
59 59
60 TEST_F(MetricsServiceTest, CloseRenderersNormally) { 60 TEST_F(MetricsServiceTest, CloseRenderersNormally) {
61 OpenTabs(); 61 OpenTabs();
62 QuitBrowser(); 62 QuitBrowser();
63 63
64 scoped_ptr<PrefService> local_state(GetLocalState()); 64 scoped_ptr<PrefService> local_state(GetLocalState());
65 local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, true); 65 local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly,
66 local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, 0); 66 true,
67 local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, 0); 67 false /* don't sync pref */);
68 local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0); 68 local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount,
69 0,
70 false /* don't sync pref */);
71 local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount,
72 0,
73 false /* don't sync pref */);
74 local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount,
75 0,
76 false /* don't sync pref */);
69 EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly)); 77 EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly));
70 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount)); 78 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount));
71 EXPECT_EQ(3, local_state->GetInteger(prefs::kStabilityPageLoadCount)); 79 EXPECT_EQ(3, local_state->GetInteger(prefs::kStabilityPageLoadCount));
72 EXPECT_EQ(0, local_state->GetInteger(prefs::kStabilityRendererCrashCount)); 80 EXPECT_EQ(0, local_state->GetInteger(prefs::kStabilityRendererCrashCount));
73 } 81 }
74 82
75 TEST_F(MetricsServiceTest, DISABLED_CrashRenderers) { 83 TEST_F(MetricsServiceTest, DISABLED_CrashRenderers) {
76 // This doesn't make sense to test in single process mode. 84 // This doesn't make sense to test in single process mode.
77 if (ProxyLauncher::in_process_renderer()) 85 if (ProxyLauncher::in_process_renderer())
78 return; 86 return;
(...skipping 19 matching lines...) Expand all
98 #endif 106 #endif
99 ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kAboutCrashURL))); 107 ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kAboutCrashURL)));
100 } 108 }
101 109
102 // Give the browser a chance to notice the crashed tab. 110 // Give the browser a chance to notice the crashed tab.
103 base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms()); 111 base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
104 112
105 QuitBrowser(); 113 QuitBrowser();
106 114
107 scoped_ptr<PrefService> local_state(GetLocalState()); 115 scoped_ptr<PrefService> local_state(GetLocalState());
108 local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, true); 116 local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly,
109 local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, 0); 117 true,
110 local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, 0); 118 false /* don't sync pref */);
111 local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0); 119 local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount,
120 0,
121 false /* don't sync pref */);
122 local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount,
123 0,
124 false /* don't sync pref */);
125 local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount,
126 0,
127 false /* don't sync pref */);
112 EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly)); 128 EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly));
113 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount)); 129 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount));
114 EXPECT_EQ(4, local_state->GetInteger(prefs::kStabilityPageLoadCount)); 130 EXPECT_EQ(4, local_state->GetInteger(prefs::kStabilityPageLoadCount));
115 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityRendererCrashCount)); 131 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityRendererCrashCount));
116 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698