PART3: Removed whitelist special ops.

chrome/browser/chromeos/login/signed_settings_helper.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/login/signed_settings_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
@@ skipping 83 matching lines @@
     delete this;
   }
 
   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,
-                     OpContext::Delegate* delegate)
-      : OpContext(callback, delegate),
-        type_(type),
-        email_(email) {
-  }
-
-  // chromeos::SignedSettings::Delegate implementation
-  virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
-                                     bool value) OVERRIDE {
-    if (callback_) {
-      switch (type_) {
-        case CHECK:
-          callback_->OnCheckWhitelistCompleted(code, email_);
-          break;
-        case ADD:
-          callback_->OnWhitelistCompleted(code, email_);
-          break;
-        case REMOVE:
-          callback_->OnUnwhitelistCompleted(code, email_);
-          break;
-        default:
-          LOG(ERROR) << "Unknown WhitelistOpContext type " << type_;
-          break;
-      }
-    }
-    OnOpCompleted();
-  }
-
- protected:
-  // OpContext implemenetation
-  virtual void CreateOp() OVERRIDE {
-    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;
-    }
-  }
-
- 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 base::Value& value,
                          SignedSettingsHelper::Callback* callback,
                          OpContext::Delegate* delegate)
       : OpContext(callback, delegate),
         name_(name),
         value_(value.DeepCopy()) {
@@ skipping 111 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RetrievePolicyOpContext);
 };
 
 }  // namespace
 
 
 class SignedSettingsHelperImpl : public SignedSettingsHelper,
                                  public OpContext::Delegate {
  public:
   // SignedSettingsHelper implementation
-  virtual void StartCheckWhitelistOp(const std::string& email,
-                                     Callback* callback) OVERRIDE;
-  virtual void StartWhitelistOp(const std::string& email,
-                                bool add_to_whitelist,
-                                Callback* callback) OVERRIDE;
   virtual void StartStorePropertyOp(const std::string& name,
                                     const base::Value& value,
                                     Callback* callback) OVERRIDE;
   virtual void StartRetrieveProperty(const std::string& name,
                                      Callback* callback) OVERRIDE;
   virtual void StartStorePolicyOp(const em::PolicyFetchResponse& policy,
                                   Callback* callback) OVERRIDE;
   virtual void StartRetrievePolicyOp(Callback* callback) OVERRIDE;
   virtual void CancelCallback(Callback* callback) OVERRIDE;
 
@@ skipping 22 matching lines @@
 }
 
 SignedSettingsHelperImpl::~SignedSettingsHelperImpl() {
   if (!pending_contexts_.empty()) {
     LOG(WARNING) << "SignedSettingsHelperImpl shutdown with pending ops, "
                  << "changes will be lost.";
     ClearAll();
   }
 }
 
-void SignedSettingsHelperImpl::StartCheckWhitelistOp(
-    const std::string&email,
-    SignedSettingsHelper::Callback* callback) {
-  AddOpContext(new WhitelistOpContext(
-      WhitelistOpContext::CHECK,
-      email,
-      callback,
-      this));
-}
-
-void SignedSettingsHelperImpl::StartWhitelistOp(
-    const std::string&email,
-    bool add_to_whitelist,
-    SignedSettingsHelper::Callback* callback) {
-  AddOpContext(new WhitelistOpContext(
-      add_to_whitelist ? WhitelistOpContext::ADD : WhitelistOpContext::REMOVE,
-      email,
-      callback,
-      this));
-}
-
 void SignedSettingsHelperImpl::StartStorePropertyOp(
     const std::string& name,
     const base::Value& value,
     SignedSettingsHelper::Callback* callback) {
   AddOpContext(new StorePropertyOpContext(
       name,
       value,
       callback,
       this));
 }
@@ skipping 68 matching lines @@
 
   if (test_delegate_)
     test_delegate_->OnOpCompleted(context->op());
 }
 
 SignedSettingsHelper* SignedSettingsHelper::Get() {
   return g_signed_settings_helper_impl.Pointer();
 }
 
 }  // namespace chromeos