| 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 =
|
|
|