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

Unified Diff: chrome_frame/test/reliability/page_load_test.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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
« no previous file with comments | « chrome/test/reliability/page_load_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/reliability/page_load_test.cc
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 478ce545e581faf87c0ddb3c9c1c779383c67da5..1a6b7815b603eb32ec163c56f9ec06c7b6c2507d 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -428,19 +428,21 @@ class PageLoadTest : public testing::Test {
// Get a PrefService whose contents correspond to the Local State file
// that was saved by the app as it closed. The caller takes ownership of the
// returned PrefService object.
- PrefService* GetLocalState() {
+ PrefServiceSimple* GetLocalState() {
FilePath path;
chrome::GetChromeFrameUserDataDirectory(&path);
- return PrefServiceMockBuilder().WithUserFilePrefs(
+ PrefServiceMockBuilder builder;
+ builder.WithUserFilePrefs(
path,
JsonPrefStore::GetTaskRunnerForFile(
- path, content::BrowserThread::GetBlockingPool())).Create();
+ path, content::BrowserThread::GetBlockingPool()));
+ return builder.CreateSimple();
}
void GetStabilityMetrics(NavigationMetrics* metrics) {
if (!metrics)
return;
- scoped_ptr<PrefService> local_state(GetLocalState());
+ scoped_ptr<PrefServiceSimple> local_state(GetLocalState());
if (!local_state.get())
return;
local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);
« no previous file with comments | « chrome/test/reliability/page_load_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698