Code cleaning: Uses scoped_ptr<> to express ownership rather than writing ownership in comments.

Replaces Response* with scoped_ptr<Response> in dbus code and its related code.

BUG=163231
TEST=no regression / no behavior changes


Review URL: https://chromiumcodereview.appspot.com/12092061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181266 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 19 insertions, 20 deletions

diff --git a/chrome/browser/chromeos/dbus/liveness_service_provider.cc b/chrome/browser/chromeos/dbus/liveness_service_provider.cc
index 3954974..9be70e3 100644
--- a/chrome/browser/chromeos/dbus/liveness_service_provider.cc
+++ b/chrome/browser/chromeos/dbus/liveness_service_provider.cc
@@ -47,8 +47,7 @@ void LivenessServiceProvider::CheckLiveness(
     dbus::MethodCall* method_call,
     dbus::ExportedObject::ResponseSender response_sender) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-  response_sender.Run(response);
+  response_sender.Run(dbus::Response::FromMethodCall(method_call));
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc
index a2ecec4..2f4a639 100644
--- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc
+++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc
@@ -239,7 +239,7 @@ void ProxyResolutionServiceProvider::ResolveProxyHandler(
       !reader.PopString(&signal_interface) ||
       !reader.PopString(&signal_name)) {
     LOG(ERROR) << "Unexpected method call: " << method_call->ToString();
-    response_sender.Run(NULL);
+    response_sender.Run(scoped_ptr<dbus::Response>());
     return;
   }
 
@@ -250,8 +250,7 @@ void ProxyResolutionServiceProvider::ResolveProxyHandler(
 
   // Send an empty response for now. We'll send a signal once the network proxy
   // resolution is completed.
-  dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-  response_sender.Run(response);
+  response_sender.Run(dbus::Response::FromMethodCall(method_call));
 }
 
 // static
@@ -261,7 +260,7 @@ void ProxyResolutionServiceProvider::CallResolveProxyHandler(
     dbus::ExportedObject::ResponseSender response_sender) {
   if (!provider_weak_ptr) {
     LOG(WARNING) << "Called after the object is deleted";
-    response_sender.Run(NULL);
+    response_sender.Run(scoped_ptr<dbus::Response>());
     return;
   }
   provider_weak_ptr->ResolveProxyHandler(method_call, response_sender);
diff --git a/chrome/browser/chromeos/dbus/service_provider_test_helper.cc b/chrome/browser/chromeos/dbus/service_provider_test_helper.cc
index afc9ec6..57ee646 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
-
diff --git a/chrome/browser/chromeos/dbus/service_provider_test_helper.h b/chrome/browser/chromeos/dbus/service_provider_test_helper.h
index af5cb8e..17f6f8a 100644
--- a/chrome/browser/chromeos/dbus/service_provider_test_helper.h
+++ b/chrome/browser/chromeos/dbus/service_provider_test_helper.h
@@ -52,7 +52,7 @@ class ServiceProviderTestHelper {
       dbus::ObjectProxy::OnConnectedCallback on_connected_callback);
 
   // Calls tested dbus method.
-  dbus::Response* CallMethod(dbus::MethodCall* method_call);
+  scoped_ptr<dbus::Response> CallMethod(dbus::MethodCall* method_call);
 
   // Cleanups helper. Should be called after |CallMethod()|.
   void TearDown();
@@ -66,8 +66,9 @@ class ServiceProviderTestHelper {
       dbus::ExportedObject::OnExportedCallback on_exported_callback);
 
   // Calls exported method and waits for a response for |mock_object_proxy_|.
-  dbus::Response* MockCallMethodAndBlock(dbus::MethodCall* method_call,
-                                         ::testing::Unused);
+  dbus::Response* MockCallMethodAndBlock(
+      dbus::MethodCall* method_call,
+      ::testing::Unused);
 
   // Behaves as |mock_object_proxy_|'s ConnectToSignal().
   void MockConnectToSignal(
@@ -80,7 +81,7 @@ class ServiceProviderTestHelper {
   void MockSendSignal(dbus::Signal* signal);
 
   // Receives a response and makes it available to MockCallMethodAndBlock().
-  void OnResponse(dbus::Response* response);
+  void OnResponse(scoped_ptr<dbus::Response> response);
 
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockExportedObject> mock_exported_object_;
@@ -95,4 +96,3 @@ class ServiceProviderTestHelper {
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_
-