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

Unified Diff: chrome/browser/prefs/proxy_policy_unittest.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator
Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/proxy_policy_unittest.cc
diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc
index e7963abce6c057239cbcde3c436872d997884170..0bb5d35d9c033575678949ec9fe59d923266202c 100644
--- a/chrome/browser/prefs/proxy_policy_unittest.cc
+++ b/chrome/browser/prefs/proxy_policy_unittest.cc
@@ -7,7 +7,9 @@
#include "base/command_line.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/browser/prefs/command_line_pref_store.h"
#include "chrome/browser/prefs/pref_service_mock_factory.h"
#include "chrome/browser/prefs/pref_service_syncable.h"
#include "chrome/common/chrome_switches.h"
@@ -97,9 +99,12 @@ class ProxyPolicyTest : public testing::Test {
scoped_ptr<PrefService> CreatePrefService(bool with_managed_policies) {
PrefServiceMockFactory factory;
- factory.SetCommandLine(&command_line_);
- if (with_managed_policies)
- factory.SetManagedPolicies(policy_service_.get());
+ factory.set_command_line_prefs(new CommandLinePrefStore(&command_line_));
+ if (with_managed_policies) {
+ factory.SetManagedPolicies(policy_service_.get(),
+ g_browser_process->browser_policy_connector());
+ }
+
scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
new user_prefs::PrefRegistrySyncable);
scoped_ptr<PrefServiceSyncable> prefs =

Powered by Google App Engine
This is Rietveld 408576698