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

chrome/browser/chromeos/login/signed_settings_helper_unittest.cc

Index: chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
diff --git a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
index e54318cf2014b12108f792d5670beae8916cde4c..fea799c570f4d669239ecac02946006bf0300c0f 100644
--- a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
@@ -40,11 +40,11 @@ class MockSignedSettingsHelperCallback : public SignedSettingsHelper::Callback {
   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,
@@ -52,7 +52,7 @@ class SignedSettingsHelperTest : public testing::Test,
  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_),
@@ -99,7 +99,7 @@ class SignedSettingsHelperTest : public testing::Test,
 
   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_;
@@ -111,6 +111,8 @@ class SignedSettingsHelperTest : public testing::Test,
   ScopedStubCrosEnabler stub_cros_enabler_;
 };
 
+ACTION(ConsumeValue) { delete arg0; }
+
 TEST_F(SignedSettingsHelperTest, SerializedOps) {
   MockSignedSettingsHelperCallback cb;
 
@@ -148,7 +150,7 @@ TEST_F(SignedSettingsHelperTest, SerializedOps) {
       .Times(1);
 
   EXPECT_CALL(cb, OnRetrievePropertyCompleted(SignedSettings::SUCCESS, _, _))
-      .Times(1);
+      .WillOnce(WithArg<2>(ConsumeValue()));
 
   pending_ops_ = 5;
   SignedSettingsHelper::Get()->StartWhitelistOp(fake_email_, true, &cb);
@@ -202,7 +204,7 @@ TEST_F(SignedSettingsHelperTest, CanceledOps) {
       .Times(1);
 
   EXPECT_CALL(cb, OnRetrievePropertyCompleted(SignedSettings::SUCCESS, _, _))
-      .Times(1);
+      .WillOnce(WithArg<2>(ConsumeValue()));
 
   pending_ops_ = 6;
   SignedSettingsHelper::Get()->StartWhitelistOp(fake_email_, true, &cb);