Skip to content

GitLab

T
tangled
Commit 6cde4795 authored by nona@chromium.org's avatar nona@chromium.org
Browse files
Options

Fix wrong usage of MethodCall resposne. 

BUG=None
TEST=ran chromeos_unittests


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148537 0039d316-1c4b-4281-b951-d872f2087c98
parent 4b773fc5
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 40 deletions
chromeos/dbus/ibus/ibus_engine_factory_service.cc
View file @ 6cde4795
......@@ -65,11 +65,11 @@ class IBusEngineFactoryServiceImpl : public IBusEngineFactoryService {
if(create_engine_handler_.is_null()) {
LOG(WARNING) << "The CreateEngine handler is NULL.";
} else {
dbus::Response* response = dbus::Response::FromMethodCall(method_call);
dbus::MessageWriter writer(response);
const dbus::ObjectPath path = create_engine_handler_.Run(engine_name);
scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
dbus::MessageWriter writer(response.get());
writer.AppendObjectPath(path);
response_sender.Run(response.get());
response_sender.Run(response);
}
}
......
chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
View file @ 6cde4795
......@@ -32,6 +32,7 @@ class MockCreateEngineResponseSender {
// Checks the given |response| meets expectation for the CreateEngine method.
void CheckCreateEngineResponse(dbus::Response* response) {
scoped_ptr<dbus::Response> response_deleter(response);
dbus::MessageReader reader(response);
dbus::ObjectPath actual_path;
ASSERT_TRUE(reader.PopObjectPath(&actual_path));
......@@ -129,6 +130,7 @@ TEST_F(IBusEngineFactoryServiceTest, CreateEngineTest) {
dbus::MethodCall method_call(
ibus::engine_factory::kServiceInterface,
ibus::engine_factory::kCreateEngineMethod);
method_call.SetSerial(10);
dbus::MessageWriter writer(&method_call);
writer.AppendString(kSampleEngine);
ASSERT_FALSE(
......
chromeos/dbus/ibus/ibus_engine_service.cc
View file @ 6cde4795
......@@ -219,9 +219,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......@@ -229,9 +228,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......@@ -239,9 +237,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......@@ -249,9 +246,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......@@ -275,9 +271,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......@@ -292,9 +287,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
}
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.
......@@ -309,9 +303,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
}
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.
......@@ -327,18 +320,16 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......@@ -365,11 +356,10 @@ class IBusEngineServiceImpl : public IBusEngineService {
}
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.
......@@ -399,9 +389,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......@@ -430,9 +419,8 @@ class IBusEngineServiceImpl : public IBusEngineService {
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.
......
chromeos/dbus/ibus/ibus_engine_service_unittest.cc
View file @ 6cde4795
......@@ -63,6 +63,7 @@ class EmptyResponseExpectation {
// Evaluates the given |resposne| has no argument.
void Evaluate(dbus::Response* response) {
scoped_ptr<dbus::Response> response_deleter(response);
EXPECT_EQ(serial_no_, response->GetReplySerial());
dbus::MessageReader reader(response);
EXPECT_FALSE(reader.HasMoreData());
......@@ -84,6 +85,7 @@ class BoolResponseExpectation {
// Evaluates the given |resposne| has only one boolean and which is equals to
// |result_| which is given in ctor.
void Evaluate(dbus::Response* response) {
scoped_ptr<dbus::Response> response_deleter(response);
EXPECT_EQ(serial_no_, response->GetReplySerial());
dbus::MessageReader reader(response);
bool result = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment