components: Move PrefRegistrySyncable into user_prefs namespace.

chrome/browser/extensions/default_apps.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/default_apps.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "components/user_prefs/pref_registry_syncable.h"
-#if !defined(OS_ANDROID)
-#include "chrome/browser/first_run/first_run.h"
-#endif
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/first_run/first_run.h"
+#endif
+
 namespace {
 
 const char kGmailId[] = "pjkljhegncpnkpknbcohdijeoejaedia";
 const char kSearchId[] = "coobgpohoikkiipiblmjeljniedjpjpf";
 const char kYoutubeId[] = "blpcfgokakmgnkcojhhkbfbldkacnbeo";
 
 // Returns true if the app was a default app in Chrome 22
 bool IsOldDefaultApp(const std::string& extension_id) {
   return extension_id == kGmailId || extension_id == kSearchId
       || extension_id == kYoutubeId;
@@ skipping 11 matching lines @@
       return false;
     }
   }
   return true;
 }
 
 } // namespace
 
 namespace default_apps {
 
-void RegisterUserPrefs(PrefRegistrySyncable* registry) {
-  registry->RegisterIntegerPref(prefs::kDefaultAppsInstallState, kUnknown,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
+void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+  registry->RegisterIntegerPref(
+      prefs::kDefaultAppsInstallState,
+      kUnknown,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 bool Provider::ShouldInstallInProfile() {
   // We decide to install or not install default apps based on the following
   // criteria, from highest priority to lowest priority:
   //
   // - The command line option.  Tests use this option to disable installation
   //   of default apps in some cases.
   // - If the locale is not compatible with the defaults, don't install them.
   // - The kDefaultApps preferences value in the profile.  This value is
@@ skipping 100 matching lines @@
     for (std::set<std::string>::iterator it = new_default_apps.begin();
          it != new_default_apps.end(); ++it) {
       prefs->Remove(*it, NULL);
     }
   }
 
   ExternalProviderImpl::SetPrefs(prefs);
 }
 
 }  // namespace default_apps