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

Unified Diff: chrome/browser/chromeos/dbus/service_provider_test_helper.cc

Issue 12092061: Code cleaning: Uses scoped_ptr<> to express ownership rather than writing ownership in comments. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added chrome/browser/password_manager/native_backend_kwallet_x_unitte\ 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/dbus/service_provider_test_helper.cc
diff --git a/chrome/browser/chromeos/dbus/service_provider_test_helper.cc b/chrome/browser/chromeos/dbus/service_provider_test_helper.cc
index afc9ec6394c60709b94755983028496b5ee8b725..57ee64652bcbbdd60430b63adf446c5a085d4722 100644
--- a/chrome/browser/chromeos/dbus/service_provider_test_helper.cc
+++ b/chrome/browser/chromeos/dbus/service_provider_test_helper.cc
@@ -57,17 +57,17 @@ void ServiceProviderTestHelper::SetUp(
new dbus::MockObjectProxy(mock_bus_.get(),
kLibCrosServiceName,
dbus::ObjectPath(kLibCrosServicePath));
- // |mock_object_proxy_|'s CallMethodAndBlock() will use
+ // |mock_object_proxy_|'s MockCallMethodAndBlock() will use
// MockCallMethodAndBlock() to return responses.
EXPECT_CALL(*mock_object_proxy_,
- CallMethodAndBlock(
+ MockCallMethodAndBlock(
AllOf(
ResultOf(
std::mem_fun(&dbus::MethodCall::GetInterface),
- kLibCrosServiceInterface),
+ kLibCrosServiceInterface),
ResultOf(
std::mem_fun(&dbus::MethodCall::GetMember),
- exported_method_name)),
+ exported_method_name)),
_))
.WillOnce(Invoke(this,
&ServiceProviderTestHelper::MockCallMethodAndBlock));
@@ -102,9 +102,10 @@ void ServiceProviderTestHelper::SetUpReturnSignal(
signal_callback, on_connected_callback);
}
-dbus::Response* ServiceProviderTestHelper::CallMethod(
+scoped_ptr<dbus::Response> ServiceProviderTestHelper::CallMethod(
dbus::MethodCall* method_call) {
- return mock_object_proxy_->CallMethodAndBlock(method_call,
+ return mock_object_proxy_->CallMethodAndBlock(
+ method_call,
dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
}
@@ -155,12 +156,12 @@ void ServiceProviderTestHelper::MockSendSignal(dbus::Signal* signal) {
on_signal_callback_.Run(signal);
}
-void ServiceProviderTestHelper::OnResponse(dbus::Response* response) {
- response_.reset(response);
+void ServiceProviderTestHelper::OnResponse(
+ scoped_ptr<dbus::Response> response) {
+ response_ = response.Pass();
response_received_ = true;
if (message_loop_.is_running())
message_loop_.Quit();
}
} // namespace chromeos
-

Powered by Google App Engine
This is Rietveld 408576698