commit 1a77e63ea8fda3b530d2a63b35b46dfb735078c2
author nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Aug 08 02:10:02 2012
committer nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Aug 08 02:10:02 2012
tree f7ea86f38e38fa6bf54c501a0093467868f284b5
parent dfcc8927737e14edd5890c509ae113794435a470

[sync] Refactor how default sync datatypes are set.

Android does not sync all datatypes, so we need a way to differentiate
which datatypes should be enabled by default.

Since parts of this require extensions, we need to register the user preferences for extensions as part of this.

BUG=139057
TEST=Signing in to sync on should enable all the correct default
datatypes.

Review URL: https://chromiumcodereview.appspot.com/10829019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150485 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 81931c7..67f95ff 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -201,6 +201,7 @@
   chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
   chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
   DownloadPrefs::RegisterUserPrefs(user_prefs);
+  extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
   ExtensionWebUI::RegisterUserPrefs(user_prefs);
   GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
   HostContentSettingsMap::RegisterUserPrefs(user_prefs);
@@ -242,7 +243,6 @@
   ChromeToMobileService::RegisterUserPrefs(user_prefs);
   extensions::CommandService::RegisterUserPrefs(user_prefs);
   extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
-  extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
   ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
   RegisterBrowserUserPrefs(user_prefs);
   RegisterAutolaunchPrefs(user_prefs);