Fix wrong usage of MethodCall resposne.

chromeos/dbus/ibus/ibus_engine_service.cc

 // 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.
 
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 201 matching lines @@
                         ibus::engine::kRequireSurroundingTextSignal);
     exported_object_->SendSignal(&signal);
   }
 
  private:
   // Handles FocusIn method call from ibus-daemon.
   void FocusIn(dbus::MethodCall* method_call,
                dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(engine_handler_.get());
     engine_handler_->FocusIn();
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles FocusOut method call from ibus-daemon.
   void FocusOut(dbus::MethodCall* method_call,
                 dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(engine_handler_.get());
     engine_handler_->FocusOut();
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles Enable method call from ibus-daemon.
   void Enable(dbus::MethodCall* method_call,
               dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(engine_handler_.get());
     engine_handler_->Enable();
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles Disable method call from ibus-daemon.
   void Disable(dbus::MethodCall* method_call,
                dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(engine_handler_.get());
     engine_handler_->Disable();
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles PropertyActivate method call from ibus-daemon.
   void PropertyActivate(dbus::MethodCall* method_call,
                         dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     std::string property_name;
     if (!reader.PopString(&property_name)) {
       LOG(WARNING) << "PropertyActivate called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 property_state = 0;
     if (!reader.PopUint32(&property_state)) {
       LOG(WARNING) << "PropertyActivate called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     DCHECK(engine_handler_.get());
     engine_handler_->PropertyActivate(
         property_name,
         static_cast<IBusEngineHandlerInterface::IBusPropertyState>(
             property_state));
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles PropertyShow method call from ibus-daemon.
   void PropertyShow(dbus::MethodCall* method_call,
                     dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     std::string property_name;
     if (!reader.PopString(&property_name)) {
       LOG(WARNING) << "PropertyShow called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     DCHECK(engine_handler_.get());
     engine_handler_->PropertyShow(property_name);
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles PropertyHide method call from ibus-daemon.
   void PropertyHide(dbus::MethodCall* method_call,
                     dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     std::string property_name;
     if (!reader.PopString(&property_name)) {
       LOG(WARNING) << "PropertyHide called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     DCHECK(engine_handler_.get());
     engine_handler_->PropertyHide(property_name);
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles SetCapability method call from ibus-daemon.
   void SetCapability(dbus::MethodCall* method_call,
                      dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     uint32 capability = 0;
     if (!reader.PopUint32(&capability)) {
       LOG(WARNING) << "SetCapability called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     DCHECK(engine_handler_.get());
     engine_handler_->SetCapability(
         static_cast<IBusEngineHandlerInterface::IBusCapability>(capability));
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   void Reset(dbus::MethodCall* method_call,
              dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(engine_handler_.get());
     engine_handler_->Reset();
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles ProcessKeyEvent method call from ibus-daemon.
   void ProcessKeyEvent(dbus::MethodCall* method_call,
                        dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     uint32 keysym = 0;
     if (!reader.PopUint32(&keysym)) {
       LOG(WARNING) << "ProcessKeyEvent called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 keycode = 0;
     if (!reader.PopUint32(&keycode)) {
       LOG(WARNING) << "ProcessKeyEvent called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 state = 0;
     if (!reader.PopUint32(&state)) {
       LOG(WARNING) << "ProcessKeyEvent called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     DCHECK(engine_handler_.get());
     bool consume = engine_handler_->ProcessKeyEvent(keysym, keycode, state);
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    dbus::MessageWriter writer(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    dbus::MessageWriter writer(response);
     writer.AppendBool(consume);
-    response_sender.Run(response.get());
+    response_sender.Run(response);
   }
 
   // Handles CandidateClicked method call from ibus-daemon.
   void CandidateClicked(dbus::MethodCall* method_call,
                         dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     uint32 index = 0;
     if (!reader.PopUint32(&index)) {
       LOG(WARNING) << "CandidateClicked called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 button = 0;
     if (!reader.PopUint32(&button)) {
       LOG(WARNING) << "CandidateClicked called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 state = 0;
     if (!reader.PopUint32(&state)) {
       LOG(WARNING) << "CandidateClicked called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     DCHECK(engine_handler_.get());
     engine_handler_->CandidateClicked(
         index,
         static_cast<IBusEngineHandlerInterface::IBusMouseButton>(button),
         state);
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Handles SetSurroundingText method call from ibus-daemon.
   void SetSurroundingText(
       dbus::MethodCall* method_call,
       dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     std::string text;
     if (!reader.PopString(&text)) {
       LOG(WARNING) << "SetSurroundingText called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 cursor_pos = 0;
     if (!reader.PopUint32(&cursor_pos)) {
       LOG(WARNING) << "CandidateClicked called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 anchor_pos = 0;
     if (!reader.PopUint32(&anchor_pos)) {
       LOG(WARNING) << "CandidateClicked called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
 
     DCHECK(engine_handler_.get());
     engine_handler_->SetSurroundingText(text, cursor_pos, anchor_pos);
-    scoped_ptr<dbus::Response> response(
-        dbus::Response::FromMethodCall(method_call));
-    response_sender.Run(response.get());
+    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    response_sender.Run(response);
   }
 
   // Called when the method call is exported.
   void OnMethodExported(const std::string& interface_name,
                         const std::string& method_name,
                         bool success) {
     LOG_IF(WARNING, !success) << "Failed to export "
                               << interface_name << "." << method_name;
   }
 
@@ skipping 45 matching lines @@
     DBusClientImplementationType type,
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new IBusEngineServiceImpl(bus, object_path);
   else
     return new IBusEngineServiceStubImpl();
 }
 
 }  // namespace chromeos