components: Move PrefRegistrySyncable into user_prefs namespace.

chrome/browser/chromeos/proxy_config_service_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/prefs/pref_member.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 
 class PrefRegistrySimple;
+
+namespace user_prefs {
 class PrefRegistrySyncable;
+}
 
 namespace chromeos {
 
 // Implementation of proxy config service for chromeos that:
 // - extends PrefProxyConfigTrackerImpl (and so lives and runs entirely on UI
 //   thread) to handle proxy from prefs (via PrefProxyConfigTrackerImpl) and
 //   system i.e. network (via shill notifications)
 // - exists one per profile and one per local state
 // - retrieves initial system proxy configuration from cros settings persisted
 //   on chromeos device from chromeos revisions before migration to shill,
 // - persists proxy setting per network in flimflim
 // - provides network stack with latest effective proxy configuration for
 //   currently active network via PrefProxyConfigTrackerImpl's mechanism of
 //   pushing config to ChromeProxyConfigService
 // - provides UI with methods to retrieve and modify proxy configuration for
 //   any remembered network (either currently active or non-active) of current
 //   user profile
-class ProxyConfigServiceImpl
-    : public PrefProxyConfigTrackerImpl,
-      public NetworkLibrary::NetworkManagerObserver,
-      public NetworkLibrary::NetworkObserver {
+class ProxyConfigServiceImpl: public PrefProxyConfigTrackerImpl,

[Jói, 2013/05/04 21:31:47]

space before :

[tfarina, 2013/05/05 00:45:59]

Done.

+                              public NetworkLibrary::NetworkManagerObserver,
+                              public NetworkLibrary::NetworkObserver {
  public:
   // ProxyConfigServiceImpl is created in ProxyServiceFactory::
   // CreatePrefProxyConfigTrackerImpl via Profile::GetProxyConfigTracker() for
   // profile or IOThread constructor for local state and is owned by the
   // respective classes.
   //
   // From the UI, it is accessed via Profile::GetProxyConfigTracker to allow
   // user to read or modify the proxy configuration via UIGetProxyConfig or
   // UISetProxyConfigTo* respectively.
   // The new modified proxy config, together with proxy from prefs if available,
@@ skipping 146 matching lines @@
   virtual void OnNetworkChanged(NetworkLibrary* cros,
                                 const Network* network) OVERRIDE;
 
   // Parse |network| proxy config and store result in |proxy_config|.
   // Returns true if proxy config was successfully parsed.
   static bool ParseProxyConfig(const Network* network,
                                net::ProxyConfig* proxy_config);
 
   // Register UseShardProxies preference.
   static void RegisterPrefs(PrefRegistrySimple* registry);
-  static void RegisterUserPrefs(PrefRegistrySyncable* registry);
+  static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
 
 #if defined(UNIT_TEST)
   void SetTesting(ProxyConfig* test_config) {
     UIMakeActiveNetworkCurrent();
     if (test_config) {
       std::string value;
       test_config->SerializeForNetwork(&value);
       SetProxyConfigForNetwork(active_network_, value, false);
     }
   }
@@ skipping 79 matching lines @@
   std::vector<base::Closure> callbacks_;
 
   base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_