Remove the DBus dependency on CommitText.

BUG=288388

Review URL: https://codereview.chromium.org/23498022

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

10 files changed, 5 insertions, 87 deletions

diff --git a/chromeos/dbus/ibus/ibus_constants.h b/chromeos/dbus/ibus/ibus_constants.h
index cdb9e13..de81d8c 100644
--- a/chromeos/dbus/ibus/ibus_constants.h
+++ b/chromeos/dbus/ibus/ibus_constants.h
@@ -31,7 +31,6 @@ const char kExitMethod[] = "Exit";
 
 namespace input_context {
 const char kServiceInterface[] = "org.freedesktop.IBus.InputContext";
-const char kCommitTextSignal[] = "CommitText";
 const char kForwardKeyEventSignal[] = "ForwardKeyEvent";
 const char kHidePreeditTextSignal[] = "HidePreeditText";
 const char kShowPreeditTextSignal[] = "ShowPreeditText";
diff --git a/chromeos/dbus/ibus/ibus_engine_service.cc b/chromeos/dbus/ibus/ibus_engine_service.cc
index 9e968a1..7998d6f 100644
--- a/chromeos/dbus/ibus/ibus_engine_service.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service.cc
@@ -67,17 +67,6 @@ class IBusEngineServiceDaemonlessImpl : public IBusEngineService {
   }
 
   // IBusEngineService override.
-  virtual void CommitText(const std::string& text) OVERRIDE {
-    IBusInputContextHandlerInterface* input_context =
-        IBusBridge::Get()->GetInputContextHandler();
-    if (input_context) {
-      IBusText ibus_text;
-      ibus_text.set_text(text);
-      input_context->CommitText(ibus_text);
-    }
-  }
-
-  // IBusEngineService override.
   virtual void DeleteSurroundingText(int32 offset, uint32 length) OVERRIDE {
     IBusInputContextHandlerInterface* input_context =
         IBusBridge::Get()->GetInputContextHandler();
diff --git a/chromeos/dbus/ibus/ibus_engine_service.h b/chromeos/dbus/ibus/ibus_engine_service.h
index 48fb62c..b7c9400 100644
--- a/chromeos/dbus/ibus/ibus_engine_service.h
+++ b/chromeos/dbus/ibus/ibus_engine_service.h
@@ -54,8 +54,6 @@ class CHROMEOS_EXPORT IBusEngineService {
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode, uint32 state) = 0;
   // Emits RequireSurroundingText signal.
   virtual void RequireSurroundingText() = 0;
-  // Emits CommitText signal.
-  virtual void CommitText(const std::string& text) = 0;
   // Emits DeleteSurroundingText signal.
   virtual void DeleteSurroundingText(int32 offset, uint32 length) = 0;
 
diff --git a/chromeos/dbus/ibus/ibus_input_context_client.cc b/chromeos/dbus/ibus/ibus_input_context_client.cc
index 86bc6fe..31b082c 100644
--- a/chromeos/dbus/ibus/ibus_input_context_client.cc
+++ b/chromeos/dbus/ibus/ibus_input_context_client.cc
@@ -231,20 +231,6 @@ class IBusInputContextClientImpl : public IBusInputContextClient {
     error_callback.Run();
   }
 
-  // Handles CommitText signal.
-  void OnCommitText(dbus::Signal* signal) {
-    if (!handler_)
-      return;
-    dbus::MessageReader reader(signal);
-    IBusText ibus_text;
-    if (!PopIBusText(&reader, &ibus_text)) {
-      // The IBus message structure may be changed.
-      LOG(ERROR) << "Invalid signal: " << signal->ToString();
-      return;
-    }
-    handler_->CommitText(ibus_text);
-  }
-
   // Handles ForwardKeyEvetn signal.
   void OnForwardKeyEvent(dbus::Signal* signal) {
     if (!handler_)
@@ -313,14 +299,6 @@ class IBusInputContextClientImpl : public IBusInputContextClient {
   void ConnectSignals() {
     proxy_->ConnectToSignal(
         ibus::input_context::kServiceInterface,
-        ibus::input_context::kCommitTextSignal,
-        base::Bind(&IBusInputContextClientImpl::OnCommitText,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
-                   weak_ptr_factory_.GetWeakPtr()));
-
-    proxy_->ConnectToSignal(
-        ibus::input_context::kServiceInterface,
         ibus::input_context::kForwardKeyEventSignal,
         base::Bind(&IBusInputContextClientImpl::OnForwardKeyEvent,
                    weak_ptr_factory_.GetWeakPtr()),
diff --git a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
index 2c9200b..654beb3 100644
--- a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
@@ -50,7 +50,7 @@ const ibus::IBusPropertyState kPropertyState =
 
 class MockInputContextHandler : public IBusInputContextHandlerInterface {
  public:
-  MOCK_METHOD1(CommitText, void(const IBusText& text));
+  MOCK_METHOD1(CommitText, void(const std::string& text));
   MOCK_METHOD3(ForwardKeyEvent,
                void(uint32 keyval, uint32 keycode, uint32 state));
   MOCK_METHOD0(ShowPreeditText, void());
@@ -111,13 +111,6 @@ class IBusInputContextClientTest : public testing::Test {
     // Initialize function.
     EXPECT_CALL(*mock_proxy_.get(),
                 ConnectToSignal(ibus::input_context::kServiceInterface,
-                                ibus::input_context::kCommitTextSignal,
-                                _,
-                                _))
-        .WillRepeatedly(
-             Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
-    EXPECT_CALL(*mock_proxy_.get(),
-                ConnectToSignal(ibus::input_context::kServiceInterface,
                                 ibus::input_context::kForwardKeyEventSignal,
                                 _,
                                 _))
@@ -354,31 +347,6 @@ class IBusInputContextClientTest : public testing::Test {
   }
 };
 
-TEST_F(IBusInputContextClientTest, CommitTextHandler) {
-  const char kSampleText[] = "Sample Text";
-  IBusText ibus_text;
-  ibus_text.set_text(kSampleText);
-
-  // Set handler expectations.
-  MockInputContextHandler mock_handler;
-  EXPECT_CALL(mock_handler, CommitText(IBusTextEq(&ibus_text)));
-  client_->SetInputContextHandler(&mock_handler);
-  message_loop_.RunUntilIdle();
-
-  // Emit signal.
-  dbus::Signal signal(ibus::input_context::kServiceInterface,
-                      ibus::input_context::kCommitTextSignal);
-  dbus::MessageWriter writer(&signal);
-  AppendIBusText(ibus_text, &writer);
-  ASSERT_FALSE(
-      signal_callback_map_[ibus::input_context::kCommitTextSignal].is_null());
-  signal_callback_map_[ibus::input_context::kCommitTextSignal].Run(&signal);
-
-  // Unset the handler so expect not calling handler.
-  client_->SetInputContextHandler(NULL);
-  signal_callback_map_[ibus::input_context::kCommitTextSignal].Run(&signal);
-}
-
 TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) {
   // Set handler expectations.
   MockInputContextHandler mock_handler;
diff --git a/chromeos/dbus/ibus/mock_ibus_engine_service.cc b/chromeos/dbus/ibus/mock_ibus_engine_service.cc
index ffe06d5..4c93662 100644
--- a/chromeos/dbus/ibus/mock_ibus_engine_service.cc
+++ b/chromeos/dbus/ibus/mock_ibus_engine_service.cc
@@ -12,7 +12,6 @@ MockIBusEngineService::MockIBusEngineService()
     : update_preedit_call_count_(0),
       update_auxiliary_text_call_count_(0),
       forward_key_event_call_count_(0),
-      commit_text_call_count_(0),
       delete_surrounding_text_call_count_(0),
       last_update_preedit_arg_(new UpdatePreeditArg()),
       last_update_aux_text_arg_(new UpdateAuxiliaryTextArg()),
@@ -57,11 +56,6 @@ void MockIBusEngineService::ForwardKeyEvent(uint32 keyval,
 void MockIBusEngineService::RequireSurroundingText() {
 }
 
-void MockIBusEngineService::CommitText(const std::string& text) {
-  ++commit_text_call_count_;
-  last_commit_text_ = text;
-}
-
 void MockIBusEngineService::DeleteSurroundingText(int32 offset,uint32 length) {
   ++delete_surrounding_text_call_count_;
   last_delete_surrounding_text_arg_->offset = offset;
@@ -76,9 +70,7 @@ void MockIBusEngineService::Clear() {
   update_preedit_call_count_ = 0;
   update_auxiliary_text_call_count_ = 0;
   forward_key_event_call_count_ = 0;
-  commit_text_call_count_ = 0;
   delete_surrounding_text_call_count_ = 0;
-  last_commit_text_.clear();
   last_update_preedit_arg_.reset(new UpdatePreeditArg());
   last_update_aux_text_arg_.reset(new UpdateAuxiliaryTextArg());
   last_delete_surrounding_text_arg_.reset(new DeleteSurroundingTextArg());
diff --git a/chromeos/dbus/ibus/mock_ibus_engine_service.h b/chromeos/dbus/ibus/mock_ibus_engine_service.h
index 27fc6e9..5d33246c 100644
--- a/chromeos/dbus/ibus/mock_ibus_engine_service.h
+++ b/chromeos/dbus/ibus/mock_ibus_engine_service.h
@@ -49,16 +49,12 @@ class MockIBusEngineService : public IBusEngineService {
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode,
                                uint32 state) OVERRIDE;
   virtual void RequireSurroundingText() OVERRIDE;
-  virtual void CommitText(const std::string& text) OVERRIDE;
   virtual void DeleteSurroundingText(int32 offset, uint32 length) OVERRIDE;
 
   IBusEngineHandlerInterface* GetEngine() const;
 
   void Clear();
 
-  int commit_text_call_count() const { return commit_text_call_count_; }
-  const std::string& last_commit_text() const { return last_commit_text_; }
-
   int update_preedit_call_count() const { return update_preedit_call_count_; }
   const UpdatePreeditArg& last_update_preedit_arg() const {
     return *last_update_preedit_arg_.get();
@@ -82,10 +78,8 @@ class MockIBusEngineService : public IBusEngineService {
   int update_preedit_call_count_;
   int update_auxiliary_text_call_count_;
   int forward_key_event_call_count_;
-  int commit_text_call_count_;
   int delete_surrounding_text_call_count_;
 
-  std::string last_commit_text_;
   scoped_ptr<UpdatePreeditArg> last_update_preedit_arg_;
   scoped_ptr<UpdateAuxiliaryTextArg> last_update_aux_text_arg_;
   scoped_ptr<DeleteSurroundingTextArg> last_delete_surrounding_text_arg_;
diff --git a/chromeos/ime/ibus_bridge.h b/chromeos/ime/ibus_bridge.h
index 17be71b..3cf7c5f 100644
--- a/chromeos/ime/ibus_bridge.h
+++ b/chromeos/ime/ibus_bridge.h
@@ -21,7 +21,7 @@ class IBusLookupTable;
 class CHROMEOS_EXPORT IBusInputContextHandlerInterface {
  public:
   // Called when the engine commit a text.
-  virtual void CommitText(const IBusText& text) = 0;
+  virtual void CommitText(const std::string& text) = 0;
 
   // Called when the engine forward a key event.
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode, uint32 state) = 0;
diff --git a/chromeos/ime/mock_ime_input_context_handler.cc b/chromeos/ime/mock_ime_input_context_handler.cc
index 67281c1..135e0f6 100644
--- a/chromeos/ime/mock_ime_input_context_handler.cc
+++ b/chromeos/ime/mock_ime_input_context_handler.cc
@@ -20,9 +20,9 @@ MockIMEInputContextHandler::MockIMEInputContextHandler()
 MockIMEInputContextHandler::~MockIMEInputContextHandler() {
 }
 
-void MockIMEInputContextHandler::CommitText(const IBusText& text) {
+void MockIMEInputContextHandler::CommitText(const std::string& text) {
   ++commit_text_call_count_;
-  last_commit_text_ = text.text();
+  last_commit_text_ = text;
 }
 
 void MockIMEInputContextHandler::ForwardKeyEvent(uint32 keyval,
diff --git a/chromeos/ime/mock_ime_input_context_handler.h b/chromeos/ime/mock_ime_input_context_handler.h
index 054c2ed..6d5630a 100644
--- a/chromeos/ime/mock_ime_input_context_handler.h
+++ b/chromeos/ime/mock_ime_input_context_handler.h
@@ -27,7 +27,7 @@ class CHROMEOS_EXPORT MockIMEInputContextHandler
   MockIMEInputContextHandler();
   virtual ~MockIMEInputContextHandler();
 
-  virtual void CommitText(const IBusText& text) OVERRIDE;
+  virtual void CommitText(const std::string& text) OVERRIDE;
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode,
                                uint32 state) OVERRIDE;
   virtual void UpdatePreeditText(const IBusText& text,