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

chrome/browser/chromeos/login/signed_settings_helper_unittest.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 "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/mock_ownership_service.h"
@@ skipping 22 matching lines @@
  public:
   MOCK_METHOD2(OnCheckWhitelistCompleted, void(
       SignedSettings::ReturnCode code, const std::string& email));
   MOCK_METHOD2(OnWhitelistCompleted, void(
       SignedSettings::ReturnCode code, const std::string& email));
   MOCK_METHOD2(OnUnwhitelistCompleted, void(
       SignedSettings::ReturnCode code, const std::string& email));
   MOCK_METHOD3(OnStorePropertyCompleted, void(
       SignedSettings::ReturnCode code,
       const std::string& name,
-      const std::string& value));
+      const base::Value& value));
   MOCK_METHOD3(OnRetrievePropertyCompleted, void(
       SignedSettings::ReturnCode code,
       const std::string& name,
-      const std::string& value));
+      const base::Value* value));
 };
 
 class SignedSettingsHelperTest : public testing::Test,
                                  public SignedSettingsHelper::TestDelegate {
  public:
   SignedSettingsHelperTest()
       : fake_email_("fakey@example.com"),
-        fake_prop_(kAccountsPrefAllowGuest),
+        fake_prop_(kReleaseChannel),
         fake_value_("false"),
         message_loop_(MessageLoop::TYPE_UI),
         ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE),
         pending_ops_(0) {
   }
 
   virtual void SetUp() {
     file_thread_.Start();
     SignedSettingsHelper::Get()->set_test_delegate(this);
@@ skipping 26 matching lines @@
   em::PolicyData BuildPolicyData() {
     em::PolicyData to_return;
     em::ChromeDeviceSettingsProto pol;
     to_return.set_policy_type(SignedSettings::kDevicePolicyType);
     to_return.set_policy_value(pol.SerializeAsString());
     return to_return;
   }
 
   const std::string fake_email_;
   const std::string fake_prop_;
-  const std::string fake_value_;
+  const base::StringValue fake_value_;
   MockOwnershipService m_;
 
   MessageLoop message_loop_;
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
 
   int pending_ops_;
 
   ScopedStubCrosEnabler stub_cros_enabler_;
 };
 
+ACTION(ConsumeValue) { delete arg0; }
+
 TEST_F(SignedSettingsHelperTest, SerializedOps) {
   MockSignedSettingsHelperCallback cb;
 
   EXPECT_CALL(m_, GetStatus(_))
       .Times(2)
       .WillRepeatedly(Return(OwnershipService::OWNERSHIP_TAKEN));
   EXPECT_CALL(m_, has_cached_policy())
       .Times(5)
       .WillRepeatedly(Return(true));
   em::PolicyData fake_pol = BuildPolicyData();
@@ skipping 17 matching lines @@
       .WillOnce(WithArg<1>(Invoke(&SignedSettingsHelperTest::OnKeyOpComplete)));
   EXPECT_CALL(cb, OnUnwhitelistCompleted(SignedSettings::SUCCESS, _))
       .Times(1);
 
   EXPECT_CALL(m_, StartSigningAttempt(_, A<OwnerManager::Delegate*>()))
       .WillOnce(WithArg<1>(Invoke(&SignedSettingsHelperTest::OnKeyOpComplete)));
   EXPECT_CALL(cb, OnStorePropertyCompleted(SignedSettings::SUCCESS, _, _))
       .Times(1);
 
   EXPECT_CALL(cb, OnRetrievePropertyCompleted(SignedSettings::SUCCESS, _, _))
-      .Times(1);
+      .WillOnce(WithArg<2>(ConsumeValue()));
 
   pending_ops_ = 5;
   SignedSettingsHelper::Get()->StartWhitelistOp(fake_email_, true, &cb);
   SignedSettingsHelper::Get()->StartCheckWhitelistOp(fake_email_, &cb);
   SignedSettingsHelper::Get()->StartWhitelistOp(fake_email_, false, &cb);
   SignedSettingsHelper::Get()->StartStorePropertyOp(fake_prop_, fake_value_,
       &cb);
   SignedSettingsHelper::Get()->StartRetrieveProperty(fake_prop_, &cb);
 
   message_loop_.Run();
@@ skipping 33 matching lines @@
 
   // CheckWhitelistOp for cb_to_be_canceled still gets executed but callback
   // does not happen.
 
   EXPECT_CALL(m_, StartSigningAttempt(_, A<OwnerManager::Delegate*>()))
       .WillOnce(WithArg<1>(Invoke(&SignedSettingsHelperTest::OnKeyOpComplete)));
   EXPECT_CALL(cb, OnStorePropertyCompleted(SignedSettings::SUCCESS, _, _))
       .Times(1);
 
   EXPECT_CALL(cb, OnRetrievePropertyCompleted(SignedSettings::SUCCESS, _, _))
-      .Times(1);
+      .WillOnce(WithArg<2>(ConsumeValue()));
 
   pending_ops_ = 6;
   SignedSettingsHelper::Get()->StartWhitelistOp(fake_email_, true, &cb);
   SignedSettingsHelper::Get()->StartCheckWhitelistOp(fake_email_, &cb);
   SignedSettingsHelper::Get()->StartWhitelistOp(fake_email_, false, &cb);
 
   MockSignedSettingsHelperCallback cb_to_be_canceled;
   SignedSettingsHelper::Get()->StartCheckWhitelistOp(fake_email_,
       &cb_to_be_canceled);
   SignedSettingsHelper::Get()->CancelCallback(&cb_to_be_canceled);
 
   SignedSettingsHelper::Get()->StartStorePropertyOp(fake_prop_, fake_value_,
       &cb);
   SignedSettingsHelper::Get()->StartRetrieveProperty(fake_prop_, &cb);
 
   message_loop_.Run();
 }
 
 }  // namespace chromeos