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

chrome/browser/chromeos/login/signed_settings_helper.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/login/signed_settings_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 72 matching lines @@
   virtual void CreateOp() = 0;
 
   // Callback on op completion.
   virtual void OnOpCompleted() {
     if (delegate_)
       delegate_->OnOpCompleted(this);
 
     delete this;
   }
 
-  // Callback on op failure.
-  virtual void OnOpFailed() {
-    OnOpCompleted();
-  }
-
   bool executing_;
   Delegate* delegate_;
 
   scoped_refptr<SignedSettings> op_;
   SignedSettingsHelper::Callback* callback_;
 };
 
 class WhitelistOpContext : public SignedSettings::Delegate<bool>,
                            public OpContext {
  public:
   enum Type {
     CHECK,
     ADD,
     REMOVE,
   };
 
   WhitelistOpContext(Type type,
                      const std::string& email,
                      SignedSettingsHelper::Callback* callback,
                      Delegate* delegate)
       : OpContext(callback, delegate),
         type_(type),
         email_(email) {
   }
 
   // chromeos::SignedSettings::Delegate implementation
-  virtual void OnSettingsOpSucceeded(bool value) {
+  virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
+                                     bool value) {
     if (callback_) {
       switch (type_) {
         case CHECK:
-          callback_->OnCheckWhiteListCompleted(value, email_);
+          if (code != SignedSettings::SUCCESS)
+            value = false;  // Should be true already, but just to be sure.

[Denis Lagno, 2010/12/09 11:54:12]

for my eye comment disagrees with the code

[Chris Masone, 2010/12/09 16:33:42]

again, you are right!

+          callback_->OnCheckWhitelistCompleted(code, value, email_);
           break;
         case ADD:
-          callback_->OnWhitelistCompleted(value, email_);
+          callback_->OnWhitelistCompleted(code, email_);
           break;
         case REMOVE:
-          callback_->OnUnwhitelistCompleted(value, email_);
+          callback_->OnUnwhitelistCompleted(code, email_);
           break;
         default:
           LOG(ERROR) << "Unknown WhitelistOpContext type " << type_;
           break;
       }
     }
-
     OnOpCompleted();
   }
 
-  virtual void OnSettingsOpFailed(SignedSettings::FailureCode code) {
-    OnOpFailed();
-  }
-
  protected:
   // OpContext implemenetation
   virtual void CreateOp() {
     switch (type_) {
       case CHECK:
         op_ = SignedSettings::CreateCheckWhitelistOp(email_, this);
         break;
       case ADD:
         op_ = SignedSettings::CreateWhitelistOp(email_, true, this);
         break;
       case REMOVE:
         op_ = SignedSettings::CreateWhitelistOp(email_, false, this);
         break;
       default:
         LOG(ERROR) << "Unknown WhitelistOpContext type " << type_;
         break;
     }
   }
 
-  virtual void OnOpFailed() {
-    if (callback_) {
-      switch (type_) {
-        case CHECK:
-          callback_->OnCheckWhiteListCompleted(false, email_);
-          break;
-        case ADD:
-          callback_->OnWhitelistCompleted(false, email_);
-          break;
-        case REMOVE:
-          callback_->OnUnwhitelistCompleted(false, email_);
-          break;
-        default:
-          LOG(ERROR) << "Unknown WhitelistOpContext type " << type_;
-          break;
-      }
-    }
-
-    OnOpCompleted();
-  }
-
  private:
   Type type_;
   std::string email_;
 
   DISALLOW_COPY_AND_ASSIGN(WhitelistOpContext);
 };
 
 class StorePropertyOpContext : public SignedSettings::Delegate<bool>,
                                public OpContext {
  public:
   StorePropertyOpContext(const std::string& name,
                          const std::string& value,
                          SignedSettingsHelper::Callback* callback,
                          Delegate* delegate)
       : OpContext(callback, delegate),
         name_(name),
         value_(value) {
   }
 
   // chromeos::SignedSettings::Delegate implementation
-  virtual void OnSettingsOpSucceeded(bool value) {
+  virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
+                                     bool unused) {
     if (callback_)
-      callback_->OnStorePropertyCompleted(true, name_, value_);
+      callback_->OnStorePropertyCompleted(code, name_, value_);
     OnOpCompleted();
   }
 
-  virtual void OnSettingsOpFailed(SignedSettings::FailureCode code) {
-    OnOpFailed();
-  }
-
  protected:
   // OpContext implemenetation
   virtual void CreateOp() {
     op_ = SignedSettings::CreateStorePropertyOp(name_, value_, this);
   }
 
-  virtual void OnOpFailed() {
-    if (callback_)
-      callback_->OnStorePropertyCompleted(false, name_, value_);
-    OnOpCompleted();
-  }
-
  private:
   std::string name_;
   std::string value_;
 
   DISALLOW_COPY_AND_ASSIGN(StorePropertyOpContext);
 };
 
 class RetrievePropertyOpContext
     : public SignedSettings::Delegate<std::string>,
       public OpContext {
  public:
   RetrievePropertyOpContext(const std::string& name,
                             SignedSettingsHelper::Callback* callback,
                             Delegate* delegate)
       : OpContext(callback, delegate),
         name_(name) {
   }
 
   // chromeos::SignedSettings::Delegate implementation
-  virtual void OnSettingsOpSucceeded(std::string value) {
+  virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
+                                     std::string value) {
     if (callback_)
-      callback_->OnRetrievePropertyCompleted(true, name_, value);
+      callback_->OnRetrievePropertyCompleted(code, name_, value);
 
     OnOpCompleted();
   }
 
-  virtual void OnSettingsOpFailed(SignedSettings::FailureCode code) {
-    OnOpFailed();
-  }
-
  protected:
   // OpContext implemenetation
   virtual void CreateOp() {
     op_ = SignedSettings::CreateRetrievePropertyOp(name_, this);
   }
 
-  virtual void OnOpFailed() {
-    if (callback_)
-      callback_->OnRetrievePropertyCompleted(false, name_, std::string());
-    OnOpCompleted();
-  }
-
  private:
   std::string name_;
 
   DISALLOW_COPY_AND_ASSIGN(RetrievePropertyOpContext);
 };
 
 }  // namespace
 
 
 class SignedSettingsHelperImpl : public SignedSettingsHelper,
@@ skipping 132 matching lines @@
 
   if (test_delegate_)
     test_delegate_->OnOpCompleted(context->op());
 }
 
 SignedSettingsHelper* SignedSettingsHelper::Get() {
   return Singleton<SignedSettingsHelperImpl>::get();
 }
 
 }  // namespace chromeos