PART2: Make SignedSettings use proper Value types instead of string all around the place.

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"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/values.h"
 #include "chrome/browser/chromeos/login/signed_settings.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 140 matching lines @@
   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,
+                         const base::Value& value,
                          SignedSettingsHelper::Callback* callback,
                          OpContext::Delegate* delegate)
       : OpContext(callback, delegate),
         name_(name),
-        value_(value) {
+        value_(value.DeepCopy()) {
   }
 
   // chromeos::SignedSettings::Delegate implementation
   virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
                                      bool unused) OVERRIDE {
     VLOG(2) << "OnSettingsOpCompleted, code = " << code;
     if (callback_)
-      callback_->OnStorePropertyCompleted(code, name_, value_);
+      callback_->OnStorePropertyCompleted(code, name_, *value_);
     OnOpCompleted();
   }
 
  protected:
   // OpContext implemenetation
   virtual void CreateOp() OVERRIDE {
-    op_ = SignedSettings::CreateStorePropertyOp(name_, value_, this);
+    op_ = SignedSettings::CreateStorePropertyOp(name_, *value_, this);
   }
 
  private:
   std::string name_;
-  std::string value_;
+  scoped_ptr<base::Value> value_;
 
   DISALLOW_COPY_AND_ASSIGN(StorePropertyOpContext);
 };
 
 class RetrievePropertyOpContext
-    : public SignedSettings::Delegate<std::string>,
+    : public SignedSettings::Delegate<const base::Value*>,
       public OpContext {
  public:
   RetrievePropertyOpContext(const std::string& name,
                             SignedSettingsHelper::Callback* callback,
                             OpContext::Delegate* delegate)
       : OpContext(callback, delegate),
         name_(name) {
   }
 
   // chromeos::SignedSettings::Delegate implementation
   virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
-                                     std::string value) OVERRIDE {
+                                     const base::Value* value) OVERRIDE {
     if (callback_)
       callback_->OnRetrievePropertyCompleted(code, name_, value);
 
     OnOpCompleted();
   }
 
  protected:
   // OpContext implemenetation
   virtual void CreateOp() OVERRIDE {
     op_ = SignedSettings::CreateRetrievePropertyOp(name_, this);
@@ skipping 69 matching lines @@
 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 std::string& value,
+                                    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;
 
   // OpContext::Delegate implementation
   virtual void OnOpCreated(OpContext* context);
@@ skipping 43 matching lines @@
     SignedSettingsHelper::Callback* callback) {
   AddOpContext(new WhitelistOpContext(
       add_to_whitelist ? WhitelistOpContext::ADD : WhitelistOpContext::REMOVE,
       email,
       callback,
       this));
 }
 
 void SignedSettingsHelperImpl::StartStorePropertyOp(
     const std::string& name,
-    const std::string& value,
+    const base::Value& value,
     SignedSettingsHelper::Callback* callback) {
   AddOpContext(new StorePropertyOpContext(
       name,
       value,
       callback,
       this));
 }
 
 void SignedSettingsHelperImpl::StartRetrieveProperty(
     const std::string& name,
@@ skipping 65 matching lines @@
 
   if (test_delegate_)
     test_delegate_->OnOpCompleted(context->op());
 }
 
 SignedSettingsHelper* SignedSettingsHelper::Get() {
   return g_signed_settings_helper_impl.Pointer();
 }
 
 }  // namespace chromeos