Revert 121920 - dbus: add ObjectPath type

content/browser/geolocation/wifi_data_provider_linux_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "content/browser/geolocation/wifi_data_provider_linux.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "dbus/message.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_object_proxy.h"
-#include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::Unused;
 
 class GeolocationWifiDataProviderLinuxTest : public testing::Test {
   void SetUp() {
     // Create a mock bus.
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SYSTEM;
     mock_bus_ = new dbus::MockBus(options);
 
     // Create a mock proxy that behaves as NetworkManager.
     mock_network_manager_proxy_ =
-        new dbus::MockObjectProxy(
-            mock_bus_.get(),
-            "org.freedesktop.NetworkManager",
-            dbus::ObjectPath("/org/freedesktop/NetworkManager"));
+        new dbus::MockObjectProxy(mock_bus_.get(),
+                                  "org.freedesktop.NetworkManager",
+                                  "/org/freedesktop/NetworkManager");
     // Set an expectation so mock_network_manager_proxy_'s
     // CallMethodAndBlock() will use CreateNetowrkManagerProxyResponse()
     // to return responses.
     EXPECT_CALL(*mock_network_manager_proxy_,
                 CallMethodAndBlock(_, _))
         .WillRepeatedly(Invoke(
             this,
             &GeolocationWifiDataProviderLinuxTest::
             CreateNetowrkManagerProxyResponse));
 
     // Create a mock proxy that behaves as NetworkManager/Devices/0.
     mock_device_proxy_ =
-        new dbus::MockObjectProxy(
-            mock_bus_.get(),
-            "org.freedesktop.NetworkManager",
-            dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0"));
+        new dbus::MockObjectProxy(mock_bus_.get(),
+                                  "org.freedesktop.NetworkManager",
+                                  "/org/freedesktop/NetworkManager/Devices/0");
     EXPECT_CALL(*mock_device_proxy_,
                 CallMethodAndBlock(_, _))
         .WillRepeatedly(Invoke(
             this,
             &GeolocationWifiDataProviderLinuxTest::CreateDeviceProxyResponse));
 
     // Create a mock proxy that behaves as NetworkManager/AccessPoint/0.
     mock_access_point_proxy_ =
         new dbus::MockObjectProxy(
             mock_bus_.get(),
             "org.freedesktop.NetworkManager",
-            dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0"));
+            "/org/freedesktop/NetworkManager/AccessPoint/0");
     EXPECT_CALL(*mock_access_point_proxy_,
                 CallMethodAndBlock(_, _))
         .WillRepeatedly(Invoke(
             this,
             &GeolocationWifiDataProviderLinuxTest::
             CreateAccessPointProxyResponse));
 
     // Set an expectation so mock_bus_'s GetObjectProxy() for the given
     // service name and the object path will return
     // mock_network_manager_proxy_.
     EXPECT_CALL(*mock_bus_, GetObjectProxy(
         "org.freedesktop.NetworkManager",
-        dbus::ObjectPath("/org/freedesktop/NetworkManager")))
+        "/org/freedesktop/NetworkManager"))
         .WillOnce(Return(mock_network_manager_proxy_.get()));
     // Likewise, set an expectation for mock_device_proxy_.
     EXPECT_CALL(*mock_bus_, GetObjectProxy(
         "org.freedesktop.NetworkManager",
-        dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0")))
+        "/org/freedesktop/NetworkManager/Devices/0"))
         .WillOnce(Return(mock_device_proxy_.get()))
         .WillOnce(Return(mock_device_proxy_.get()));
     // Likewise, set an expectation for mock_access_point_proxy_.
     EXPECT_CALL(*mock_bus_, GetObjectProxy(
         "org.freedesktop.NetworkManager",
-        dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0")))
+        "/org/freedesktop/NetworkManager/AccessPoint/0"))
         .WillOnce(Return(mock_access_point_proxy_.get()));
 
     // ShutdownAndBlock() should be called.
     EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
 
     // Create the wlan API with the mock bus object injected.
     wifi_provider_linux_ = new WifiDataProviderLinux;
     wlan_api_.reset(
         wifi_provider_linux_->NewWlanApiForTesting(mock_bus_.get()));
     ASSERT_TRUE(wlan_api_.get());
@@ skipping 12 matching lines @@
   scoped_ptr<WifiDataProviderCommon::WlanApiInterface> wlan_api_;
 
  private:
   // Creates a response for |mock_network_manager_proxy_|.
   dbus::Response* CreateNetowrkManagerProxyResponse(
       dbus::MethodCall* method_call,
       Unused) {
     if (method_call->GetInterface() == "org.freedesktop.NetworkManager" &&
         method_call->GetMember() == "GetDevices") {
       // The list of devices is asked. Return the object path.
-      std::vector<dbus::ObjectPath> object_paths;
-      object_paths.push_back(
-          dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0"));
+      std::vector<std::string> object_paths;
+      object_paths.push_back("/org/freedesktop/NetworkManager/Devices/0");
 
       dbus::Response* response = dbus::Response::CreateEmpty();
       dbus::MessageWriter writer(response);
       writer.AppendArrayOfObjectPaths(object_paths);
       return response;
     }
 
     LOG(ERROR) << "Unexpected method call: " << method_call->ToString();
     return NULL;
   }
@@ skipping 15 matching lines @@
         const int kDeviceTypeWifi = 2;
         writer.AppendVariantOfUint32(kDeviceTypeWifi);
         return response;
       }
     } else if (method_call->GetInterface() ==
                "org.freedesktop.NetworkManager.Device.Wireless" &&
                method_call->GetMember() == "GetAccessPoints") {
       // The list of access points is asked. Return the object path.
       dbus::Response* response = dbus::Response::CreateEmpty();
       dbus::MessageWriter writer(response);
-      std::vector<dbus::ObjectPath> object_paths;
-      object_paths.push_back(
-          dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0"));
+      std::vector<std::string> object_paths;
+      object_paths.push_back("/org/freedesktop/NetworkManager/AccessPoint/0");
       writer.AppendArrayOfObjectPaths(object_paths);
       return response;
     }
 
     LOG(ERROR) << "Unexpected method call: " << method_call->ToString();
     return NULL;
   }
 
 
   // Creates a response for |mock_access_point_proxy_|.
@@ skipping 45 matching lines @@
   ASSERT_EQ(1U, access_point_data_set.size());
   AccessPointData access_point_data = *access_point_data_set.begin();
 
   // Check the contents of the access point data.
   // The expected values come from CreateAccessPointProxyResponse() above.
   EXPECT_EQ("test", UTF16ToUTF8(access_point_data.ssid));
   EXPECT_EQ("00-11-22-33-44-55", UTF16ToUTF8(access_point_data.mac_address));
   EXPECT_EQ(-50, access_point_data.radio_signal_strength);
   EXPECT_EQ(4, access_point_data.channel);
 }