Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_device_handler_unittest.cc

 // Copyright 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_device_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
@@ skipping 26 matching lines @@
         base::Bind(&NetworkDeviceHandlerTest::PropertiesSuccessCallback,
                    base::Unretained(this));
     error_callback_ = base::Bind(&NetworkDeviceHandlerTest::ErrorCallback,
                                  base::Unretained(this));
     network_device_handler_.reset(new NetworkDeviceHandler());
 
     ShillDeviceClient::TestInterface* device_test =
         DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
     device_test->ClearDevices();
     device_test->AddDevice(
-        kDefaultCellularDevicePath, flimflam::kTypeCellular, "cellular1");
-    device_test->AddDevice(
-        kDefaultWifiDevicePath, flimflam::kTypeWifi, "wifi1");
+        kDefaultCellularDevicePath, shill::kTypeCellular, "cellular1");
+    device_test->AddDevice(kDefaultWifiDevicePath, shill::kTypeWifi, "wifi1");
 
     base::FundamentalValue allow_roaming(false);
     device_test->SetDeviceProperty(
         kDefaultCellularDevicePath,
-        flimflam::kCellularAllowRoamingProperty,
+        shill::kCellularAllowRoamingProperty,
         allow_roaming);
 
     base::ListValue test_ip_configs;
     test_ip_configs.AppendString("ip_config1");
     device_test->SetDeviceProperty(
-        kDefaultWifiDevicePath, flimflam::kIPConfigsProperty, test_ip_configs);
+        kDefaultWifiDevicePath, shill::kIPConfigsProperty, test_ip_configs);
   }
 
   virtual void TearDown() OVERRIDE {
     network_device_handler_.reset();
     DBusThreadManager::Shutdown();
   }
 
   base::Closure GetErrorInvokingCallback(
       const std::string& device_path,
       const std::string& error_name) {
@@ skipping 92 matching lines @@
 }
 
 TEST_F(NetworkDeviceHandlerTest, GetDeviceProperties) {
   network_device_handler_->GetDeviceProperties(
       kDefaultWifiDevicePath,
       properties_success_callback_,
       error_callback_);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(kResultSuccess, result_);
   std::string type;
-  properties_->GetString(flimflam::kTypeProperty, &type);
-  EXPECT_EQ(flimflam::kTypeWifi, type);
+  properties_->GetString(shill::kTypeProperty, &type);
+  EXPECT_EQ(shill::kTypeWifi, type);
 }
 
 TEST_F(NetworkDeviceHandlerTest, SetDeviceProperty) {
   // Check that GetDeviceProperties returns the expected initial values.
   network_device_handler_->GetDeviceProperties(
       kDefaultCellularDevicePath,
       properties_success_callback_,
       error_callback_);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(kResultSuccess, result_);
   bool allow_roaming;
   EXPECT_TRUE(properties_->GetBooleanWithoutPathExpansion(
-      flimflam::kCellularAllowRoamingProperty, &allow_roaming));
+      shill::kCellularAllowRoamingProperty, &allow_roaming));
   EXPECT_FALSE(allow_roaming);
 
-  // Set the flimflam::kCellularAllowRoamingProperty to true. The call
+  // Set the shill::kCellularAllowRoamingProperty to true. The call
   // should succeed and the value should be set.
   base::FundamentalValue allow_roaming_value(true);
   network_device_handler_->SetDeviceProperty(
       kDefaultCellularDevicePath,
-      flimflam::kCellularAllowRoamingProperty,
+      shill::kCellularAllowRoamingProperty,
       allow_roaming_value,
       success_callback_,
       error_callback_);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(kResultSuccess, result_);
 
   // GetDeviceProperties should return the value set by SetDeviceProperty.
   network_device_handler_->GetDeviceProperties(
       kDefaultCellularDevicePath,
       properties_success_callback_,
       error_callback_);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(kResultSuccess, result_);
   EXPECT_TRUE(properties_->GetBooleanWithoutPathExpansion(
-      flimflam::kCellularAllowRoamingProperty, &allow_roaming));
+      shill::kCellularAllowRoamingProperty, &allow_roaming));
   EXPECT_TRUE(allow_roaming);
 
   // Set property on an invalid path.
   network_device_handler_->SetDeviceProperty(
       "/device/invalid_path",
-      flimflam::kCellularAllowRoamingProperty,
+      shill::kCellularAllowRoamingProperty,
       allow_roaming_value,
       success_callback_,
       error_callback_);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkDeviceHandler::kErrorFailure, result_);
 }
 
 TEST_F(NetworkDeviceHandlerTest, RequestRefreshIPConfigs) {
   network_device_handler_->RequestRefreshIPConfigs(
       kDefaultWifiDevicePath,
@@ skipping 127 matching lines @@
       kOldPin,
       kNewPin,
       GetErrorInvokingCallback(kDefaultCellularDevicePath,
                                "org.chromium.flimflam.Error.PinBlocked"),
       error_callback_);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkDeviceHandler::kErrorPinBlocked, result_);
 }
 
 }  // namespace chromeos