| Index: dbus/mock_object_proxy.h
|
| ===================================================================
|
| --- dbus/mock_object_proxy.h (revision 121922)
|
| +++ dbus/mock_object_proxy.h (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.
|
|
|
| @@ -8,7 +8,6 @@
|
|
|
| #include <string>
|
|
|
| -#include "dbus/object_path.h"
|
| #include "dbus/object_proxy.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| @@ -19,7 +18,7 @@
|
| public:
|
| MockObjectProxy(Bus* bus,
|
| const std::string& service_name,
|
| - const ObjectPath& object_path);
|
| + const std::string& object_path);
|
| virtual ~MockObjectProxy();
|
|
|
| MOCK_METHOD2(CallMethodAndBlock, Response*(MethodCall* method_call,
|
|
|