Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / geolocation / wifi_data_provider_chromeos_unittest.cc

diff --git a/src/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc b/src/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
index f9deb66..4538d02 100644 (file)
--- a/src/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
+++ b/src/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
@@ -20,7 +20,7 @@ class GeolocationChromeOsWifiDataProviderTest : public testing::Test {
   }
 
   virtual void SetUp() OVERRIDE {
-    chromeos::DBusThreadManager::InitializeWithStub();
+    chromeos::DBusThreadManager::Initialize();
     chromeos::NetworkHandler::Initialize();
     manager_client_ =
         chromeos::DBusThreadManager::Get()->GetShillManagerClient();
@@ -84,7 +84,8 @@ TEST_F(GeolocationChromeOsWifiDataProviderTest, GetOneAccessPoint) {
   AddAccessPoints(1, 1);
   EXPECT_TRUE(GetAccessPointData());
   ASSERT_EQ(1u, ap_data_.size());
-  EXPECT_EQ("00:00:03:04:05:06", UTF16ToUTF8(ap_data_.begin()->mac_address));
+  EXPECT_EQ("00:00:03:04:05:06",
+            base::UTF16ToUTF8(ap_data_.begin()->mac_address));
 }
 
 TEST_F(GeolocationChromeOsWifiDataProviderTest, GetManyAccessPoints) {