Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1021)

Side by Side Diff: dbus/mock_bus.h

Issue 11419224: Add missing (and remove superfluous) 'explicit' from constructors. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + remove non-straightforward changes Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « dbus/bus.cc ('k') | dbus/test_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DBUS_MOCK_BUS_H_ 5 #ifndef DBUS_MOCK_BUS_H_
6 #define DBUS_MOCK_BUS_H_ 6 #define DBUS_MOCK_BUS_H_
7 7
8 #include "dbus/bus.h" 8 #include "dbus/bus.h"
9 #include "dbus/object_path.h" 9 #include "dbus/object_path.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 11
12 namespace dbus { 12 namespace dbus {
13 13
14 // Mock for Bus class. Along with MockObjectProxy and MockExportedObject, 14 // Mock for Bus class. Along with MockObjectProxy and MockExportedObject,
15 // the mock classes can be used to write unit tests without issuing real 15 // the mock classes can be used to write unit tests without issuing real
16 // D-Bus calls. 16 // D-Bus calls.
17 class MockBus : public Bus { 17 class MockBus : public Bus {
18 public: 18 public:
19 MockBus(Bus::Options& options); 19 explicit MockBus(Bus::Options& options);
20 20
21 MOCK_METHOD2(GetObjectProxy, ObjectProxy*(const std::string& service_name, 21 MOCK_METHOD2(GetObjectProxy, ObjectProxy*(const std::string& service_name,
22 const ObjectPath& object_path)); 22 const ObjectPath& object_path));
23 MOCK_METHOD3(GetObjectProxyWithOptions, 23 MOCK_METHOD3(GetObjectProxyWithOptions,
24 ObjectProxy*(const std::string& service_name, 24 ObjectProxy*(const std::string& service_name,
25 const ObjectPath& object_path, 25 const ObjectPath& object_path,
26 int options)); 26 int options));
27 MOCK_METHOD1(GetExportedObject, ExportedObject*( 27 MOCK_METHOD1(GetExportedObject, ExportedObject*(
28 const ObjectPath& object_path)); 28 const ObjectPath& object_path));
29 MOCK_METHOD0(ShutdownAndBlock, void()); 29 MOCK_METHOD0(ShutdownAndBlock, void());
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 MOCK_METHOD0(AssertOnOriginThread, void()); 70 MOCK_METHOD0(AssertOnOriginThread, void());
71 MOCK_METHOD0(AssertOnDBusThread, void()); 71 MOCK_METHOD0(AssertOnDBusThread, void());
72 72
73 protected: 73 protected:
74 virtual ~MockBus(); 74 virtual ~MockBus();
75 }; 75 };
76 76
77 } // namespace dbus 77 } // namespace dbus
78 78
79 #endif // DBUS_MOCK_BUS_H_ 79 #endif // DBUS_MOCK_BUS_H_
OLDNEW
« no previous file with comments | « dbus/bus.cc ('k') | dbus/test_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698