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

Side by Side Diff: chromeos/dbus/flimflam_client_unittest_base.cc

Issue 10024054: chromeos: Convert D-Bus client classes' callback arguments to const reference (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 8 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 | « chromeos/dbus/flimflam_client_unittest_base.h ('k') | chromeos/dbus/image_burner_client.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 #include "chromeos/dbus/flimflam_client_unittest_base.h" 5 #include "chromeos/dbus/flimflam_client_unittest_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "dbus/message.h" 8 #include "dbus/message.h"
9 #include "dbus/object_path.h" 9 #include "dbus/object_path.h"
10 #include "dbus/values_util.h" 10 #include "dbus/values_util.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // ShutdownAndBlock() will be called in TearDown(). 60 // ShutdownAndBlock() will be called in TearDown().
61 EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return()); 61 EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
62 } 62 }
63 63
64 void FlimflamClientUnittestBase::TearDown() { 64 void FlimflamClientUnittestBase::TearDown() {
65 mock_bus_->ShutdownAndBlock(); 65 mock_bus_->ShutdownAndBlock();
66 } 66 }
67 67
68 void FlimflamClientUnittestBase::PrepareForMethodCall( 68 void FlimflamClientUnittestBase::PrepareForMethodCall(
69 const std::string& method_name, 69 const std::string& method_name,
70 ArgumentCheckCallback argument_checker, 70 const ArgumentCheckCallback& argument_checker,
71 dbus::Response* response) { 71 dbus::Response* response) {
72 expected_method_name_ = method_name; 72 expected_method_name_ = method_name;
73 argument_checker_ = argument_checker; 73 argument_checker_ = argument_checker;
74 response_ = response; 74 response_ = response;
75 } 75 }
76 76
77 void FlimflamClientUnittestBase::SendPropertyChangedSignal( 77 void FlimflamClientUnittestBase::SendPropertyChangedSignal(
78 dbus::Signal* signal) { 78 dbus::Signal* signal) {
79 ASSERT_FALSE(property_changed_handler_.is_null()); 79 ASSERT_FALSE(property_changed_handler_.is_null());
80 property_changed_handler_.Run(signal); 80 property_changed_handler_.Run(signal);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 const base::DictionaryValue* expected_result, 140 const base::DictionaryValue* expected_result,
141 DBusMethodCallStatus call_status, 141 DBusMethodCallStatus call_status,
142 const base::DictionaryValue& result) { 142 const base::DictionaryValue& result) {
143 EXPECT_EQ(DBUS_METHOD_CALL_SUCCESS, call_status); 143 EXPECT_EQ(DBUS_METHOD_CALL_SUCCESS, call_status);
144 EXPECT_TRUE(expected_result->Equals(&result)); 144 EXPECT_TRUE(expected_result->Equals(&result));
145 } 145 }
146 146
147 void FlimflamClientUnittestBase::OnConnectToSignal( 147 void FlimflamClientUnittestBase::OnConnectToSignal(
148 const std::string& interface_name, 148 const std::string& interface_name,
149 const std::string& signal_name, 149 const std::string& signal_name,
150 dbus::ObjectProxy::SignalCallback signal_callback, 150 const dbus::ObjectProxy::SignalCallback& signal_callback,
151 dbus::ObjectProxy::OnConnectedCallback on_connected_callback) { 151 const dbus::ObjectProxy::OnConnectedCallback& on_connected_callback) {
152 property_changed_handler_ = signal_callback; 152 property_changed_handler_ = signal_callback;
153 const bool success = true; 153 const bool success = true;
154 message_loop_.PostTask(FROM_HERE, 154 message_loop_.PostTask(FROM_HERE,
155 base::Bind(on_connected_callback, 155 base::Bind(on_connected_callback,
156 interface_name, 156 interface_name,
157 signal_name, 157 signal_name,
158 success)); 158 success));
159 } 159 }
160 160
161 void FlimflamClientUnittestBase::OnCallMethod( 161 void FlimflamClientUnittestBase::OnCallMethod(
162 dbus::MethodCall* method_call, 162 dbus::MethodCall* method_call,
163 int timeout_ms, 163 int timeout_ms,
164 dbus::ObjectProxy::ResponseCallback response_callback) { 164 const dbus::ObjectProxy::ResponseCallback& response_callback) {
165 EXPECT_EQ(interface_name_, method_call->GetInterface()); 165 EXPECT_EQ(interface_name_, method_call->GetInterface());
166 EXPECT_EQ(expected_method_name_, method_call->GetMember()); 166 EXPECT_EQ(expected_method_name_, method_call->GetMember());
167 dbus::MessageReader reader(method_call); 167 dbus::MessageReader reader(method_call);
168 argument_checker_.Run(&reader); 168 argument_checker_.Run(&reader);
169 message_loop_.PostTask(FROM_HERE, 169 message_loop_.PostTask(FROM_HERE,
170 base::Bind(response_callback, response_)); 170 base::Bind(response_callback, response_));
171 } 171 }
172 172
173 } // namespace chromeos 173 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/flimflam_client_unittest_base.h ('k') | chromeos/dbus/image_burner_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698