| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 80d6477efad2b53e74936d263df5e22731944b9a..4bcf4f57f539bf46ace0530a5c99c737fbc8f49a 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -36,6 +36,7 @@
|
| #include "chrome/browser/notifications/notification_ui_manager.h"
|
| #include "chrome/browser/page_info_model.h"
|
| #include "chrome/browser/password_manager/password_manager.h"
|
| +#include "chrome/browser/policy/browser_policy_context.h"
|
| #include "chrome/browser/policy/profile_policy_context.h"
|
| #include "chrome/browser/prefs/session_startup_pref.h"
|
| #include "chrome/browser/profiles/profile_impl.h"
|
| @@ -104,6 +105,7 @@ void RegisterLocalState(PrefService* local_state) {
|
| AutoFillManager::RegisterBrowserPrefs(local_state);
|
| BackgroundPageTracker::RegisterPrefs(local_state);
|
| NotificationUIManager::RegisterPrefs(local_state);
|
| + policy::BrowserPolicyContext::RegisterPrefs(local_state);
|
| #if defined(OS_CHROMEOS)
|
| chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
|
| chromeos::UserManager::RegisterPrefs(local_state);
|
| @@ -153,7 +155,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
|
| TemplateURLModel::RegisterUserPrefs(user_prefs);
|
| InstantController::RegisterUserPrefs(user_prefs);
|
| NetPrefObserver::RegisterPrefs(user_prefs);
|
| - policy::ProfilePolicyContext::RegisterUserPrefs(user_prefs);
|
| + policy::ProfilePolicyContext::RegisterPrefs(user_prefs);
|
| }
|
|
|
| void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) {
|
|
|