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

Side by Side Diff: chrome/browser/prefs/pref_service_mock_builder.cc

Issue 8568019: Introduce per-tab preferences service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 #include "chrome/browser/prefs/pref_service_mock_builder.h" 5 #include "chrome/browser/prefs/pref_service_mock_builder.h"
6 6
7 #include "chrome/browser/policy/configuration_policy_pref_store.h" 7 #include "chrome/browser/policy/configuration_policy_pref_store.h"
8 #include "chrome/browser/prefs/command_line_pref_store.h" 8 #include "chrome/browser/prefs/command_line_pref_store.h"
9 #include "chrome/browser/prefs/default_pref_store.h" 9 #include "chrome/browser/prefs/default_pref_store.h"
10 #include "chrome/browser/prefs/pref_model_associator.h"
11 #include "chrome/browser/prefs/pref_notifier_impl.h"
10 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/prefs/pref_value_store.h"
11 #include "chrome/browser/prefs/testing_pref_store.h" 14 #include "chrome/browser/prefs/testing_pref_store.h"
12 #include "chrome/common/json_pref_store.h" 15 #include "chrome/common/json_pref_store.h"
13 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
14 17
15 using content::BrowserThread; 18 using content::BrowserThread;
16 19
17 PrefServiceMockBuilder::PrefServiceMockBuilder() 20 PrefServiceMockBuilder::PrefServiceMockBuilder()
18 : user_prefs_(new TestingPrefStore) { 21 : user_prefs_(new TestingPrefStore) {
19 } 22 }
20 23
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 PrefServiceMockBuilder& 105 PrefServiceMockBuilder&
103 PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) { 106 PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) {
104 user_prefs_ = 107 user_prefs_ =
105 new JsonPrefStore(prefs_file, 108 new JsonPrefStore(prefs_file,
106 BrowserThread::GetMessageLoopProxyForThread( 109 BrowserThread::GetMessageLoopProxyForThread(
107 BrowserThread::FILE)); 110 BrowserThread::FILE));
108 return *this; 111 return *this;
109 } 112 }
110 113
111 PrefService* PrefServiceMockBuilder::Create() { 114 PrefService* PrefServiceMockBuilder::Create() {
112 PrefService* pref_service = 115 PrefService* pref_service = new PrefService(
113 new PrefService(managed_platform_prefs_.get(), 116 new PrefValueStore(managed_platform_prefs_.get(),
114 managed_cloud_prefs_.get(), 117 managed_cloud_prefs_.get(),
115 extension_prefs_.get(), 118 extension_prefs_.get(),
116 command_line_prefs_.get(), 119 command_line_prefs_.get(),
117 user_prefs_.get(), 120 user_prefs_.get(),
118 recommended_platform_prefs_.get(), 121 recommended_platform_prefs_.get(),
119 recommended_cloud_prefs_.get(), 122 recommended_cloud_prefs_.get(),
120 new DefaultPrefStore(), 123 new DefaultPrefStore(),
121 false); 124 new PrefModelAssociator(),
125 new PrefNotifierImpl()),
126 false);
122 managed_platform_prefs_ = NULL; 127 managed_platform_prefs_ = NULL;
123 managed_cloud_prefs_ = NULL; 128 managed_cloud_prefs_ = NULL;
124 extension_prefs_ = NULL; 129 extension_prefs_ = NULL;
125 command_line_prefs_ = NULL; 130 command_line_prefs_ = NULL;
126 user_prefs_ = NULL; 131 user_prefs_ = NULL;
127 recommended_platform_prefs_ = NULL; 132 recommended_platform_prefs_ = NULL;
128 recommended_cloud_prefs_ = NULL; 133 recommended_cloud_prefs_ = NULL;
129 user_prefs_ = new TestingPrefStore; 134 user_prefs_ = new TestingPrefStore;
130 return pref_service; 135 return pref_service;
131 } 136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698