Revert 121920 - dbus: add ObjectPath type

dbus/bus_unittest.cc

 // Copyright (c) 2012 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 "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "dbus/exported_object.h"
-#include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Used to test AddFilterFunction().
 DBusHandlerResult DummyHandler(DBusConnection* connection,
                                DBusMessage* raw_message,
                                void* user_data) {
   return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 }  // namespace
 
 TEST(BusTest, GetObjectProxy) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
 
   dbus::ObjectProxy* object_proxy1 =
       bus->GetObjectProxy("org.chromium.TestService",
-                          dbus::ObjectPath("/org/chromium/TestObject"));
+                          "/org/chromium/TestObject");
   ASSERT_TRUE(object_proxy1);
 
   // This should return the same object.
   dbus::ObjectProxy* object_proxy2 =
       bus->GetObjectProxy("org.chromium.TestService",
-                          dbus::ObjectPath("/org/chromium/TestObject"));
+                          "/org/chromium/TestObject");
   ASSERT_TRUE(object_proxy2);
   EXPECT_EQ(object_proxy1, object_proxy2);
 
   // This should not.
   dbus::ObjectProxy* object_proxy3 =
-      bus->GetObjectProxy(
-          "org.chromium.TestService",
-          dbus::ObjectPath("/org/chromium/DifferentTestObject"));
+      bus->GetObjectProxy("org.chromium.TestService",
+                          "/org/chromium/DifferentTestObject");
   ASSERT_TRUE(object_proxy3);
   EXPECT_NE(object_proxy1, object_proxy3);
 
   bus->ShutdownAndBlock();
 }
 
 TEST(BusTest, GetObjectProxyIgnoreUnknownService) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
 
   dbus::ObjectProxy* object_proxy1 =
       bus->GetObjectProxyWithOptions(
           "org.chromium.TestService",
-          dbus::ObjectPath("/org/chromium/TestObject"),
+          "/org/chromium/TestObject",
           dbus::ObjectProxy::IGNORE_SERVICE_UNKNOWN_ERRORS);
   ASSERT_TRUE(object_proxy1);
 
   // This should return the same object.
   dbus::ObjectProxy* object_proxy2 =
       bus->GetObjectProxyWithOptions(
           "org.chromium.TestService",
-          dbus::ObjectPath("/org/chromium/TestObject"),
+          "/org/chromium/TestObject",
           dbus::ObjectProxy::IGNORE_SERVICE_UNKNOWN_ERRORS);
   ASSERT_TRUE(object_proxy2);
   EXPECT_EQ(object_proxy1, object_proxy2);
 
   // This should not.
   dbus::ObjectProxy* object_proxy3 =
       bus->GetObjectProxyWithOptions(
           "org.chromium.TestService",
-          dbus::ObjectPath("/org/chromium/DifferentTestObject"),
+          "/org/chromium/DifferentTestObject",
           dbus::ObjectProxy::IGNORE_SERVICE_UNKNOWN_ERRORS);
   ASSERT_TRUE(object_proxy3);
   EXPECT_NE(object_proxy1, object_proxy3);
 
   bus->ShutdownAndBlock();
 }
 
 TEST(BusTest, GetExportedObject) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
 
   dbus::ExportedObject* object_proxy1 =
       bus->GetExportedObject("org.chromium.TestService",
-                             dbus::ObjectPath("/org/chromium/TestObject"));
+                             "/org/chromium/TestObject");
   ASSERT_TRUE(object_proxy1);
 
   // This should return the same object.
   dbus::ExportedObject* object_proxy2 =
       bus->GetExportedObject("org.chromium.TestService",
-                             dbus::ObjectPath("/org/chromium/TestObject"));
+                             "/org/chromium/TestObject");
   ASSERT_TRUE(object_proxy2);
   EXPECT_EQ(object_proxy1, object_proxy2);
 
   // This should not.
   dbus::ExportedObject* object_proxy3 =
-      bus->GetExportedObject(
-          "org.chromium.TestService",
-          dbus::ObjectPath("/org/chromium/DifferentTestObject"));
+      bus->GetExportedObject("org.chromium.TestService",
+                             "/org/chromium/DifferentTestObject");
   ASSERT_TRUE(object_proxy3);
   EXPECT_NE(object_proxy1, object_proxy3);
 
   bus->ShutdownAndBlock();
 }
 
 TEST(BusTest, ShutdownAndBlock) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
   ASSERT_FALSE(bus->shutdown_completed());
@@ skipping 35 matching lines @@
   ASSERT_FALSE(bus->AddFilterFunction(&DummyHandler, &data1));
   // Can add the same function with different data.
   ASSERT_TRUE(bus->AddFilterFunction(&DummyHandler, &data2));
 
   ASSERT_TRUE(bus->RemoveFilterFunction(&DummyHandler, &data1));
   ASSERT_FALSE(bus->RemoveFilterFunction(&DummyHandler, &data1));
   ASSERT_TRUE(bus->RemoveFilterFunction(&DummyHandler, &data2));
 
   bus->ShutdownAndBlock();
 }