Signed settings refactoring: Proper caching and more tests.

chrome/browser/chromeos/proxy_config_service_impl.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/login/signed_settings.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/notification_registrar.h"
 
 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 flimflam 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 flimflam,
 // - 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 SignedSettings::Delegate<const base::Value*>,
       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
@@ skipping 135 matching lines @@
 
   // Add/Remove callback functions for notification when network to be viewed is
   // changed by the UI.
   void AddNotificationCallback(base::Closure callback);
   void RemoveNotificationCallback(base::Closure callback);
 
   // PrefProxyConfigTrackerImpl implementation.
   virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state,
                                     const net::ProxyConfig& config) OVERRIDE;
 
-  // Implementation for SignedSettings::Delegate
-  virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
-                                     const base::Value* value) OVERRIDE;
-
   // NetworkLibrary::NetworkManagerObserver implementation.
   virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE;
 
   // NetworkLibrary::NetworkObserver implementation.
   virtual void OnNetworkChanged(NetworkLibrary* cros,
                                 const Network* network) OVERRIDE;
 
   // Register UseShardProxies preference.
   static void RegisterPrefs(PrefService* pref_service);
 
@@ skipping 49 matching lines @@
 
   // Returns true if proxy is to be ignored for network, which happens if
   // network is shared and use-shared-proxies is turned off.
   bool IgnoreProxy(const Network* network) {
     return network->profile_type() == PROFILE_SHARED && !GetUseSharedProxies();
   }
 
   // Reset UI cache variables that keep track of UI activities.
   void ResetUICache();
 
+  void FetchProxyPolicy();
+
   // Data members.
 
   // Service path of currently active network (determined via flimflam
   // notifications); if effective proxy config is from system, proxy of this
   // network will be the one taking effect.
   std::string active_network_;
 
   // State of |active_config_|.  |active_config_| is only valid if
   // |active_config_state_| is not ProxyPrefs::CONFIG_UNSET.
   ProxyPrefs::ConfigState active_config_state_;
@@ skipping 11 matching lines @@
   std::string current_ui_network_;
 
   // Proxy configuration of |current_ui_network_|.
   ProxyConfig current_ui_config_;
 
   // Track changes in UseSharedProxies user preference.
   BooleanPrefMember use_shared_proxies_;
 
   content::NotificationRegistrar registrar_;
 
-  // Operation to retrieve proxy setting from device.
-  scoped_refptr<SignedSettings> retrieve_property_op_;
-
   // Callbacks for notification when network to be viewed has been changed from
   // the UI.
   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_