Signed settings refactoring: Proper caching and more tests.

chrome/browser/chromeos/proxy_config_service_impl.cc

 // 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.
 
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
+#include "base/bind.h"
 #include "base/json/json_value_serializer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 322 matching lines @@
     *spec += scheme;
     *spec += "=";
   }
   *spec += server.ToURI();
 }
 
 //------------------- ProxyConfigServiceImpl: public methods -------------------
 
 ProxyConfigServiceImpl::ProxyConfigServiceImpl(PrefService* pref_service)
     : PrefProxyConfigTrackerImpl(pref_service),
-      active_config_state_(ProxyPrefs::CONFIG_UNSET) {
+      active_config_state_(ProxyPrefs::CONFIG_UNSET),
+      pointer_factory_(this) {
 
   // Register for notification when user logs in, so that we can activate the
   // new proxy config.
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                  content::NotificationService::AllSources());
 
   // Register for notifications of UseSharedProxies user preference.
   if (pref_service->FindPreference(prefs::kUseSharedProxies))
     use_shared_proxies_.Init(prefs::kUseSharedProxies, pref_service, this);
 
-  // Start async fetch of proxy config from settings persisted on device.
-  if (CrosLibrary::Get()->libcros_loaded()) {
-    retrieve_property_op_ = SignedSettings::CreateRetrievePropertyOp(
-        kSettingProxyEverywhere, this);
-    if (retrieve_property_op_) {
-      retrieve_property_op_->Execute();
-      VLOG(1) << this << ": Start retrieving proxy setting from device";
-    } else {
-      VLOG(1) << this << ": Fail to retrieve proxy setting from device";
-    }
+  if (CrosSettings::Get()->GetTrusted(
+          kSettingProxyEverywhere,
+          base::Bind(&ProxyConfigServiceImpl::FetchProxyPolicy,
+                     pointer_factory_.GetWeakPtr()))) {
+    FetchProxyPolicy();
   }
 
   // Register for flimflam network notifications.
   NetworkLibrary* network_lib = CrosLibrary::Get()->GetNetworkLibrary();
   OnActiveNetworkChanged(network_lib, network_lib->active_network());
   network_lib->AddNetworkManagerObserver(this);
 }
 
 ProxyConfigServiceImpl::~ProxyConfigServiceImpl() {
   NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
@@ skipping 131 matching lines @@
   Network* network = NULL;
   if (!active_network_.empty()) {
     network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
         active_network_);
     if (!network)
       LOG(ERROR) << "can't find requested network " << active_network_;
   }
   DetermineEffectiveConfig(network, true);
 }
 
-void ProxyConfigServiceImpl::OnSettingsOpCompleted(
-    SignedSettings::ReturnCode code,
-    const base::Value* value) {
-  retrieve_property_op_ = NULL;
-  if (code != SignedSettings::SUCCESS) {
-    LOG(WARNING) << this << ": Error retrieving proxy setting from device";
-    device_config_.clear();
-    return;
-  }
-  std::string policy_value;
-  value->GetAsString(&policy_value);
-  VLOG(1) << "Retrieved proxy setting from device, value=["
-          << policy_value << "]";
-  ProxyConfig device_config;
-  if (!device_config.DeserializeForDevice(policy_value) ||
-      !device_config.SerializeForNetwork(&device_config_)) {
-    LOG(WARNING) << "Can't deserialize device setting or serialize for network";
-    device_config_.clear();
-    return;
-  }
-  if (!active_network_.empty()) {
-    VLOG(1) << this << ": try migrating device config to " << active_network_;
-    SetProxyConfigForNetwork(active_network_, device_config_, true);
-  }
-}
-
 void ProxyConfigServiceImpl::OnNetworkManagerChanged(
     NetworkLibrary* network_lib) {
   VLOG(1) << this << " OnNetworkManagerChanged: use-shared-proxies="
           << GetUseSharedProxies();
   OnActiveNetworkChanged(network_lib, network_lib->active_network());
 }
 
 void ProxyConfigServiceImpl::OnNetworkChanged(NetworkLibrary* network_lib,
     const Network* network) {
   if (!network)
@@ skipping 249 matching lines @@
       ++iter;
     }
   }
 }
 
 void ProxyConfigServiceImpl::ResetUICache() {
   current_ui_network_.clear();
   current_ui_config_ = ProxyConfig();
 }
 
+void ProxyConfigServiceImpl::FetchProxyPolicy() {
+  std::string policy_value = "";

[Denis Lagno, 2011/12/01 00:38:12]

nit: just std::string policy_value; without = "" does the same.

[pastarmovj, 2011/12/01 10:07:17]

Done.

+  if (!CrosSettings::Get()->GetString(kSettingProxyEverywhere,
+                                      &policy_value)) {
+    LOG(WARNING) << this << ": Error retrieving proxy setting from device";
+    device_config_.clear();
+    return;
+  }
+
+  VLOG(1) << "Retrieved proxy setting from device, value=["
+          << policy_value << "]";
+  ProxyConfig device_config;
+  if (!device_config.DeserializeForDevice(policy_value) ||
+      !device_config.SerializeForNetwork(&device_config_)) {
+    LOG(WARNING) << "Can't deserialize device setting or serialize for network";
+    device_config_.clear();
+    return;
+  }
+  if (!active_network_.empty()) {
+    VLOG(1) << this << ": try migrating device config to " << active_network_;
+    SetProxyConfigForNetwork(active_network_, device_config_, true);
+  }
+}
+
 }  // namespace chromeos