summaryrefslogtreecommitdiffstats
path: root/dbus/mock_bus.h
diff options
context:
space:
mode:
authoradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 21:45:23 +0000
committeradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 21:45:23 +0000
commit20bed01e980a5853dd87d4c0d65d4912697f22ae (patch)
treeba248e80e0792a777a7c3ab96f319bc98f6ef025 /dbus/mock_bus.h
parente84efb11971bfbddfaff7b97f1fe8bb21fa82028 (diff)
downloadchromium_src-20bed01e980a5853dd87d4c0d65d4912697f22ae.zip
chromium_src-20bed01e980a5853dd87d4c0d65d4912697f22ae.tar.gz
chromium_src-20bed01e980a5853dd87d4c0d65d4912697f22ae.tar.bz2
Allow dbus clients to silence logging when a service is unavailable.
BUG=109696 Review URL: https://chromiumcodereview.appspot.com/9373039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/mock_bus.h')
-rw-r--r--dbus/mock_bus.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/dbus/mock_bus.h b/dbus/mock_bus.h
index 7b949cb..31c1349 100644
--- a/dbus/mock_bus.h
+++ b/dbus/mock_bus.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -21,6 +21,10 @@ class MockBus : public Bus {
MOCK_METHOD2(GetObjectProxy, ObjectProxy*(const std::string& service_name,
const std::string& object_path));
+ MOCK_METHOD3(GetObjectProxyWithOptions,
+ ObjectProxy*(const std::string& service_name,
+ const std::string& object_path,
+ int options));
MOCK_METHOD2(GetExportedObject, ExportedObject*(
const std::string& service_name,
const std::string& object_path));