dbus: add ObjectPath type

content/browser/geolocation/wifi_data_provider_linux_unittest.cc

 // 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 {
@@ skipping 84 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<std::string> object_paths;
+      std::vector<dbus::ObjectPath> 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 16 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<std::string> object_paths;
+      std::vector<dbus::ObjectPath> 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;
   }
 
 
@@ skipping 46 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);
 }