Revert 121920 - dbus: add ObjectPath type

net/base/network_change_notifier_linux_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 "net/base/network_change_notifier_linux.h"
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/waitable_event.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_object_proxy.h"
 #include "dbus/message.h"
-#include "dbus/object_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 using testing::SaveArg;
@@ skipping 11 matching lines @@
   };
 
   NetworkChangeNotifierLinuxTest()
       : initialized_(false, false) {}
 
   virtual void SetUp() {
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SYSTEM;
     mock_bus_ = new dbus::MockBus(options);
 
-    mock_object_proxy_ = new dbus::MockObjectProxy(
-        mock_bus_.get(),
-        "service_name",
-        dbus::ObjectPath("service_path"));
+    mock_object_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(),
+                                                   "service_name",
+                                                   "service_path");
     EXPECT_CALL(*mock_bus_, GetObjectProxyWithOptions(_, _, _))
         .WillOnce(Return(mock_object_proxy_.get()));
 
     EXPECT_CALL(*mock_object_proxy_, CallMethod(_, _, _))
         .WillOnce(SaveArg<2>(&response_callback_));
     EXPECT_CALL(*mock_object_proxy_, ConnectToSignal(_, _, _, _))
         .WillOnce(
             DoAll(
                 SaveArg<2>(&signal_callback_),
                 InvokeWithoutArgs(
@@ skipping 161 matching lines @@
 TEST_F(NetworkChangeNotifierLinuxTest, InvalidResponse) {
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendUint16(20);  // Uint16 instead of the expected Uint32
   RunOnNotifierThread(base::Bind(response_callback_, response.get()));
   EXPECT_FALSE(NetworkChangeNotifier::IsOffline());
 }
 
 }  // namespace
 }  // namespace net