[Chrome OS] Plumb new error codes from SignedSettings to consumers of the API

chrome/browser/chromeos/proxy_config_service_impl.cc

 // Copyright (c) 2010 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/logging.h"
 #include "base/string_util.h"
@@ skipping 471 matching lines @@
   // Should be called from IO thread.
   CheckCurrentlyOnIOThread();
   if (has_config_) {
     // Simply return the last cached proxy configuration.
     cached_config_.ToNetProxyConfig(net_config);
     return true;
   }
   return false;
 }
 
-void ProxyConfigServiceImpl::OnSettingsOpSucceeded(bool value) {
-  VLOG(1) << "Stored proxy setting to device";
+void ProxyConfigServiceImpl::OnSettingsOpCompleted(
+    SignedSettings::ReturnCode code,
+    bool value) {
   store_property_op_ = NULL;
-  if (persist_to_device_pending_)
-    PersistConfigToDevice();
+  if (SignedSettings::SUCCESS == code) {
+    VLOG(1) << "Stored proxy setting to device";
+    if (persist_to_device_pending_)
+      PersistConfigToDevice();
+  } else {
+    LOG(WARNING) << "Error storing proxy setting to device";
+    if (persist_to_device_pending_)
+      PersistConfigToDevice();

[xiyuan, 2010/12/09 17:55:39]

nit: let's move this out of the "if" since we do this in both branches.

+  }
 }
 
-void ProxyConfigServiceImpl::OnSettingsOpSucceeded(std::string value) {
-  VLOG(1) << "Retrieved proxy setting from device, value=[" << value << "]";
-  if (reference_config_.Deserialize(value)) {
-    OnUISetProxyConfig(false);
+void ProxyConfigServiceImpl::OnSettingsOpCompleted(
+    SignedSettings::ReturnCode code,
+    std::string value) {
+  if (SignedSettings::SUCCESS == code) {
+    VLOG(1) << "Retrieved proxy setting from device, value=[" << value << "]";
+    if (reference_config_.Deserialize(value)) {
+      OnUISetProxyConfig(false);
+    } else {
+      LOG(WARNING) << "Error deserializing device's proxy setting";
+      InitConfigToDefault(true);
+    }
   } else {
-    LOG(WARNING) << "Error deserializing device's proxy setting";
+    LOG(WARNING) << "Error retrieving proxy setting from device";
     InitConfigToDefault(true);
   }
   retrieve_property_op_ = NULL;
 }
 
-void ProxyConfigServiceImpl::OnSettingsOpFailed(
-    SignedSettings::FailureCode code) {
-  if (retrieve_property_op_) {
-    LOG(WARNING) << "Error retrieving proxy setting from device";
-    InitConfigToDefault(true);
-    retrieve_property_op_ = NULL;
-  } else {
-    LOG(WARNING) << "Error storing proxy setting to device";
-    store_property_op_ = NULL;
-    if (persist_to_device_pending_)
-      PersistConfigToDevice();
-  }
-}
-
 //------------------ ProxyConfigServiceImpl: private methods -------------------
 
 void ProxyConfigServiceImpl::InitConfigToDefault(bool post_to_io_thread) {
   VLOG(1) << "Using default proxy config: auto-detect";
   reference_config_.mode = ProxyConfig::MODE_AUTO_DETECT;
   reference_config_.automatic_proxy.source = ProxyConfig::SOURCE_OWNER;
   if (post_to_io_thread && can_post_task_) {
     OnUISetProxyConfig(false);
   } else {
     // Update the IO-accessible copy in |cached_config_| as well.
@@ skipping 51 matching lines @@
   has_config_ = true;
   cached_config_ = new_config;
   // Notify observers of new proxy config.
   net::ProxyConfig net_config;
   cached_config_.ToNetProxyConfig(&net_config);
   FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_,
                     OnProxyConfigChanged(net_config));
 }
 
 }  // namespace chromeos