| Index: dbus/end_to_end_sync_unittest.cc
|
| ===================================================================
|
| --- dbus/end_to_end_sync_unittest.cc (revision 121922)
|
| +++ dbus/end_to_end_sync_unittest.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// 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.
|
|
|
| @@ -6,7 +6,6 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/message.h"
|
| -#include "dbus/object_path.h"
|
| #include "dbus/object_proxy.h"
|
| #include "dbus/test_service.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -32,9 +31,8 @@
|
| client_bus_options.bus_type = dbus::Bus::SESSION;
|
| client_bus_options.connection_type = dbus::Bus::PRIVATE;
|
| client_bus_ = new dbus::Bus(client_bus_options);
|
| - object_proxy_ = client_bus_->GetObjectProxy(
|
| - "org.chromium.TestService",
|
| - dbus::ObjectPath("/org/chromium/TestObject"));
|
| + object_proxy_ = client_bus_->GetObjectProxy("org.chromium.TestService",
|
| + "/org/chromium/TestObject");
|
| ASSERT_FALSE(client_bus_->HasDBusThread());
|
| }
|
|
|
|
|