Remove base::StringValue

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

 // Copyright 2014 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/ownership/owner_settings_service_chromeos.h"
 
 #include <memory>
 #include <queue>
 #include <utility>
 
@@ skipping 65 matching lines @@
   typedef std::pair<std::string, linked_ptr<base::Value>> SetRequest;
   std::queue<SetRequest> set_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefsChecker);
 };
 
 bool FindInListValue(const std::string& needle, const base::Value* haystack) {
   const base::ListValue* list;
   if (!haystack->GetAsList(&list))
     return false;
-  return list->end() != list->Find(base::StringValue(needle));
+  return list->end() != list->Find(base::Value(needle));
 }
 
 }  // namespace
 
 class OwnerSettingsServiceChromeOSTest : public DeviceSettingsTestBase {
  public:
   OwnerSettingsServiceChromeOSTest()
       : service_(nullptr),
         local_state_(TestingBrowserProcess::GetGlobal()),
         user_data_dir_override_(chrome::DIR_USER_DATA),
@@ skipping 40 matching lines @@
   ScopedTestingLocalState local_state_;
   std::unique_ptr<DeviceSettingsProvider> provider_;
   base::ScopedPathOverride user_data_dir_override_;
   bool management_settings_set_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSTest);
 };
 
 TEST_F(OwnerSettingsServiceChromeOSTest, SingleSetTest) {
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("dev-channel"));
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("beta-channel"));
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("stable-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("dev-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("beta-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("stable-channel"));
 }
 
 TEST_F(OwnerSettingsServiceChromeOSTest, MultipleSetTest) {
   base::Value allow_guest(false);
-  base::StringValue release_channel("stable-channel");
+  base::Value release_channel("stable-channel");
   base::Value show_user_names(true);
 
   PrefsChecker checker(service_, provider_.get());
 
   checker.Set(kAccountsPrefAllowGuest, allow_guest);
   checker.Set(kReleaseChannel, release_channel);
   checker.Set(kAccountsPrefShowUserNamesOnSignIn, show_user_names);
 
   FlushDeviceSettings();
   checker.Wait();
 }
 
 TEST_F(OwnerSettingsServiceChromeOSTest, FailedSetRequest) {
   device_settings_test_helper_.set_store_result(false);
   std::string current_channel;
   ASSERT_TRUE(provider_->Get(kReleaseChannel)->GetAsString(&current_channel));
   ASSERT_NE(current_channel, "stable-channel");
 
   // Check that DeviceSettingsProvider's cache is updated.
   PrefsChecker checker(service_, provider_.get());
-  checker.Set(kReleaseChannel, base::StringValue("stable-channel"));
+  checker.Set(kReleaseChannel, base::Value("stable-channel"));
   FlushDeviceSettings();
   checker.Wait();
 
   // Check that DeviceSettingsService's policy isn't updated.
   ASSERT_EQ(current_channel, device_settings_service_.device_settings()
                                  ->release_channel()
                                  .release_channel());
 }
 
 TEST_F(OwnerSettingsServiceChromeOSTest, ForceWhitelist) {
   EXPECT_FALSE(FindInListValue(device_policy_.policy_data().username(),
                                provider_->Get(kAccountsPrefUsers)));
   // Force a settings write.
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("dev-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("dev-channel"));
   EXPECT_TRUE(FindInListValue(device_policy_.policy_data().username(),
                               provider_->Get(kAccountsPrefUsers)));
 }
 
 class OwnerSettingsServiceChromeOSNoOwnerTest
     : public OwnerSettingsServiceChromeOSTest {
  public:
   OwnerSettingsServiceChromeOSNoOwnerTest() {}
   ~OwnerSettingsServiceChromeOSNoOwnerTest() override {}
 
@@ skipping 25 matching lines @@
   InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),
             true);
   ReloadDeviceSettings();
   ASSERT_TRUE(service_->IsOwner());
 
   EXPECT_TRUE(FindInListValue(device_policy_.policy_data().username(),
                               provider_->Get(kAccountsPrefUsers)));
 }
 
 }  // namespace chromeos