Remove base::StringValue

chromeos/network/network_connect_unittest.cc

 // Copyright (c) 2013 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 "chromeos/network/network_connect.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 88 matching lines @@
  protected:
   void SetupDefaultShillState() {
     base::RunLoop().RunUntilIdle();
     device_test_ =
         DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
     device_test_->ClearDevices();
     device_test_->AddDevice("/device/stub_wifi_device1", shill::kTypeWifi,
                             "stub_wifi_device1");
     device_test_->AddDevice(kCellular1DevicePath, shill::kTypeCellular,
                             "stub_cellular_device1");
-    device_test_->SetDeviceProperty(
-        kCellular1DevicePath, shill::kTechnologyFamilyProperty,
-        base::StringValue(shill::kNetworkTechnologyGsm));
+    device_test_->SetDeviceProperty(kCellular1DevicePath,
+                                    shill::kTechnologyFamilyProperty,
+                                    base::Value(shill::kNetworkTechnologyGsm));
 
     service_test_ =
         DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
     service_test_->ClearServices();
     const bool add_to_visible = true;
 
     // Create a wifi network and set to online.
     service_test_->AddService(kWiFi1ServicePath, kWiFi1Guid, "wifi1",
                               shill::kTypeWifi, shill::kStateIdle,
                               add_to_visible);
     service_test_->SetServiceProperty(kWiFi1ServicePath,
                                       shill::kSecurityClassProperty,
-                                      base::StringValue(shill::kSecurityWep));
+                                      base::Value(shill::kSecurityWep));
     service_test_->SetServiceProperty(
         kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true));
-    service_test_->SetServiceProperty(kWiFi1ServicePath,
-                                      shill::kPassphraseProperty,
-                                      base::StringValue("password"));
+    service_test_->SetServiceProperty(
+        kWiFi1ServicePath, shill::kPassphraseProperty, base::Value("password"));
 
     // Create a cellular network.
     service_test_->AddService(kCellular1ServicePath, kCellular1Guid,
                               "cellular1", shill::kTypeCellular,
                               shill::kStateIdle, add_to_visible);
     service_test_->SetServiceProperty(
         kCellular1ServicePath, shill::kConnectableProperty, base::Value(true));
     service_test_->SetServiceProperty(
         kCellular1ServicePath, shill::kActivationStateProperty,
-        base::StringValue(shill::kActivationStateActivated));
+        base::Value(shill::kActivationStateActivated));
     service_test_->SetServiceProperty(kCellular1ServicePath,
                                       shill::kOutOfCreditsProperty,
                                       base::Value(false));
 
     base::RunLoop().RunUntilIdle();
   }
 
   std::unique_ptr<MockDelegate> mock_delegate_;
   std::unique_ptr<MockTetherDelegate> mock_tether_delegate_;
   base::MessageLoop message_loop_;
@@ skipping 92 matching lines @@
 
   NetworkConnect::Get()->MaybeShowConfigureUI(
       kCellular1Guid, NetworkConnectionHandler::kErrorConnectFailed);
 }
 
 TEST_F(NetworkConnectTest, ActivateCellular) {
   EXPECT_CALL(*mock_delegate_, ShowMobileSetupDialog(kCellular1Guid));
 
   service_test_->SetServiceProperty(
       kCellular1ServicePath, shill::kActivationStateProperty,
-      base::StringValue(shill::kActivationStateNotActivated));
+      base::Value(shill::kActivationStateNotActivated));
   base::RunLoop().RunUntilIdle();
 
   NetworkConnect::Get()->ConnectToNetworkId(kCellular1Guid);
 }
 
 TEST_F(NetworkConnectTest, ActivateCellular_Error) {
   EXPECT_CALL(*mock_delegate_, ShowMobileActivationError(kCellular1Guid));
 
   service_test_->SetServiceProperty(
       kCellular1ServicePath, shill::kActivationStateProperty,
-      base::StringValue(shill::kActivationStateNotActivated));
+      base::Value(shill::kActivationStateNotActivated));
   service_test_->SetServiceProperty(
       kCellular1ServicePath, shill::kActivationTypeProperty,
-      base::StringValue(shill::kActivationTypeNonCellular));
+      base::Value(shill::kActivationTypeNonCellular));
   base::RunLoop().RunUntilIdle();
 
   NetworkConnect::Get()->ConnectToNetworkId(kCellular1Guid);
 }
 
 TEST_F(NetworkConnectTest, ShowMobileSimDialog) {
   EXPECT_CALL(*mock_delegate_, ShowMobileSimDialog());
 
   NetworkConnect::Get()->SetTechnologyEnabled(NetworkTypePattern::Cellular(),
                                               false);
@@ skipping 60 matching lines @@
 TEST_F(NetworkConnectTest, ConnectToTetherNetwork_TetherDelegateNotSet) {
   EXPECT_CALL(*mock_tether_delegate_, ConnectToNetwork(_)).Times(0);
 
   NetworkHandler::Get()->network_state_handler()->AddTetherNetworkState(
       kTether1Guid, "TetherNetwork");
 
   NetworkConnect::Get()->ConnectToNetworkId(kTether1Guid);
 }
 
 }  // namespace chromeos