1 files changed, 6 insertions, 15 deletions
diff --git a/chromium/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc b/chromium/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc
index 7491643d312..6e6187657b4 100644
--- a/chromium/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc
+++ b/chromium/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc
@@ -8,8 +8,7 @@ namespace chromeos {
 
 MockIMECandidateWindowHandler::MockIMECandidateWindowHandler()
     : set_cursor_bounds_call_count_(0),
-      update_lookup_table_call_count_(0),
-      update_auxiliary_text_call_count_(0) {
+      update_lookup_table_call_count_(0) {
 }
 
 MockIMECandidateWindowHandler::~MockIMECandidateWindowHandler() {
@@ -17,24 +16,17 @@ MockIMECandidateWindowHandler::~MockIMECandidateWindowHandler() {
 }
 
 void MockIMECandidateWindowHandler::UpdateLookupTable(
-    const input_method::CandidateWindow& table,
+    const ui::CandidateWindow& table,
     bool visible) {
   ++update_lookup_table_call_count_;
   last_update_lookup_table_arg_.lookup_table.CopyFrom(table);
   last_update_lookup_table_arg_.is_visible = visible;
 }
 
-void MockIMECandidateWindowHandler::UpdateAuxiliaryText(const std::string& text,
-                                                        bool visible) {
-  ++update_auxiliary_text_call_count_;
-  last_update_auxiliary_text_arg_.text = text;
-  last_update_auxiliary_text_arg_.is_visible = visible;
-}
-
-void MockIMECandidateWindowHandler::UpdatePreeditText(const std::string& text,
-                                                      uint32 cursor_pos,
-                                                      bool visible) {
-}
+void MockIMECandidateWindowHandler::UpdatePreeditText(
+    const base::string16& text,
+    uint32 cursor_pos,
+    bool visible) {}
 
 void MockIMECandidateWindowHandler::SetCursorBounds(
     const gfx::Rect& cursor_bounds,
@@ -45,7 +37,6 @@ void MockIMECandidateWindowHandler::SetCursorBounds(
 void MockIMECandidateWindowHandler::Reset() {
   set_cursor_bounds_call_count_ = 0;
   update_lookup_table_call_count_ = 0;
-  update_auxiliary_text_call_count_ = 0;
 }
 
 }  // namespace chromeos