Revert 121920 - dbus: add ObjectPath type

chrome/browser/password_manager/native_backend_kwallet_x_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 <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.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 content::BrowserThread;
 using testing::_;
 using testing::Invoke;
 using testing::Return;
 using webkit::forms::PasswordForm;
 
@@ skipping 185 matching lines @@
   form_isc_.submit_element = UTF8ToUTF16("login");
   form_isc_.signon_realm = "ISC";
 
   dbus::Bus::Options options;
   options.bus_type = dbus::Bus::SESSION;
   mock_session_bus_ = new dbus::MockBus(options);
 
   mock_klauncher_proxy_ =
       new dbus::MockObjectProxy(mock_session_bus_.get(),
                                 "org.kde.klauncher",
-                                dbus::ObjectPath("/KLauncher"));
+                                "/KLauncher");
   EXPECT_CALL(*mock_klauncher_proxy_,
               CallMethodAndBlock(_, _))
       .WillRepeatedly(Invoke(this,
           &NativeBackendKWalletTest::KLauncherMethodCall));
 
   mock_kwallet_proxy_ =
       new dbus::MockObjectProxy(mock_session_bus_.get(),
                                 "org.kde.kwalletd",
-                                dbus::ObjectPath("/modules/kwalletd"));
+                                "/modules/kwalletd");
   EXPECT_CALL(*mock_kwallet_proxy_,
               CallMethodAndBlock(_, _))
       .WillRepeatedly(Invoke(this,
           &NativeBackendKWalletTest::KWalletMethodCall));
 
   EXPECT_CALL(*mock_session_bus_, GetObjectProxy(
       "org.kde.klauncher",
-      dbus::ObjectPath("/KLauncher")))
+      "/KLauncher"))
       .WillRepeatedly(Return(mock_klauncher_proxy_.get()));
   EXPECT_CALL(*mock_session_bus_, GetObjectProxy(
       "org.kde.kwalletd",
-      dbus::ObjectPath("/modules/kwalletd")))
+      "/modules/kwalletd"))
       .WillRepeatedly(Return(mock_kwallet_proxy_.get()));
 
   EXPECT_CALL(*mock_session_bus_,
               ShutdownAndBlock()).WillOnce(Return()).WillRepeatedly(Return());
 }
 
 void NativeBackendKWalletTest::TearDown() {
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
   db_thread_.Stop();
@@ skipping 743 matching lines @@
 
     RunDBThread();
 
     // The other two copies of the password in different profiles should remain.
     CheckPasswordForms("Chrome Form Data", expected);
     CheckPasswordForms("Chrome Form Data (42)", expected);
     expected.clear();
     CheckPasswordForms("Chrome Form Data (24)", expected);
   }
 }