Remove InputMethodLookupTable and use IBusLookupTable instead.

chrome/browser/chromeos/input_method/candidate_window_controller_impl_unittest.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 "chrome/browser/chromeos/input_method/candidate_window_controller_impl.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace input_method {
@@ skipping 111 matching lines @@
       kScreenRect.bottom() - infolist_window_size.height());
   EXPECT_EQ(expected_point,
             TestableCandidateWindowControllerImpl::GetInfolistWindowPosition(
                 candidate_window_rect,
                 kScreenRect,
                 infolist_window_size));
 }
 
 TEST_F(CandidateWindowControllerImplTest,
        ConvertLookupTableToInfolistEntryTest_DenseCase) {
-  InputMethodLookupTable table;
-  table.visible = true;
-  table.page_size = 10;
+  ibus::IBusLookupTable table;
+  table.set_page_size(10);
   for (size_t i = 0; i < kSampleCandidateSize; ++i) {
-    table.candidates.push_back(kSampleCandidate[i]);
-    InputMethodLookupTable::Description description;
-    description.title = kSampleDescriptionTitle[i];
-    description.body = kSampleDescriptionBody[i];
-    table.descriptions.push_back(description);
+    ibus::IBusLookupTable::Entry entry;
+    entry.value = kSampleCandidate[i];
+    entry.description_title = kSampleDescriptionTitle[i];
+    entry.description_body = kSampleDescriptionBody[i];
+    table.mutable_candidates()->push_back(entry);
   }
-  table.cursor_absolute_index = 1;
+  table.set_cursor_position(1);
 
   std::vector<InfolistWindowView::Entry> infolist_entries;
   size_t focused_index = 0;
 
   TestableCandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
       table,
       &infolist_entries,
       &focused_index);
 
   EXPECT_EQ(kSampleCandidateSize, infolist_entries.size());
   EXPECT_EQ(1UL, focused_index);
 }
 
 TEST_F(CandidateWindowControllerImplTest,
        ConvertLookupTableToInfolistEntryTest_SparseCase) {
-  InputMethodLookupTable table;
-  table.visible = true;
-  table.page_size = 10;
+  ibus::IBusLookupTable table;
+  table.set_page_size(10);
   for (size_t i = 0; i < kSampleCandidateSize; ++i) {
-    table.candidates.push_back(kSampleCandidate[i]);
-    InputMethodLookupTable::Description description;
-    table.descriptions.push_back(description);
+    ibus::IBusLookupTable::Entry entry;
+    entry.value = kSampleCandidate[i];
+    table.mutable_candidates()->push_back(entry);
   }
 
-  table.descriptions[2].title = kSampleDescriptionTitle[2];
-  table.descriptions[2].body = kSampleDescriptionBody[2];
+  std::vector<ibus::IBusLookupTable::Entry>* candidates =
+      table.mutable_candidates();
+  (*candidates)[2].description_title = kSampleDescriptionTitle[2];
+  (*candidates)[2].description_body = kSampleDescriptionBody[2];
 
-  table.cursor_absolute_index = 2;
+  table.set_cursor_position(2);
 
   std::vector<InfolistWindowView::Entry> infolist_entries;
   size_t focused_index = 0;
 
   TestableCandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
       table,
       &infolist_entries,
       &focused_index);
 
   // Infolist entries skips empty descriptions, so expected entry size is 1 and
   // expected focus index is 0.
   EXPECT_EQ(1UL, infolist_entries.size());
   EXPECT_EQ(0UL, focused_index);
 }
 
 TEST_F(CandidateWindowControllerImplTest,
        ConvertLookupTableToInfolistEntryTest_SparseNoSelectionCase) {
-  InputMethodLookupTable table;
-  table.visible = true;
-  table.page_size = 10;
+  ibus::IBusLookupTable table;
+  table.set_page_size(10);
+
   for (size_t i = 0; i < kSampleCandidateSize; ++i) {
-    table.candidates.push_back(kSampleCandidate[i]);
-    InputMethodLookupTable::Description description;
-    table.descriptions.push_back(description);
+    ibus::IBusLookupTable::Entry entry;
+    entry.value = kSampleCandidate[i];
+    table.mutable_candidates()->push_back(entry);
   }
 
-  table.descriptions[2].title = kSampleDescriptionTitle[2];
-  table.descriptions[2].body = kSampleDescriptionBody[2];
+  std::vector<ibus::IBusLookupTable::Entry>* candidates =
+      table.mutable_candidates();
+  (*candidates)[2].description_title = kSampleDescriptionTitle[2];
+  (*candidates)[2].description_body = kSampleDescriptionBody[2];
 
-  table.cursor_absolute_index = 0;
+  table.set_cursor_position(0);
 
   std::vector<InfolistWindowView::Entry> infolist_entries;
   size_t focused_index = 0;
 
   TestableCandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
       table,
       &infolist_entries,
       &focused_index);
 
   // Infolist entries skips empty descriptions, so expected entry size is 1 and
   // there is no focused index because no infolist entry candidate is selected.
   EXPECT_EQ(1UL, infolist_entries.size());
   EXPECT_EQ(static_cast<size_t>(-1), focused_index);
 }
 
 TEST_F(CandidateWindowControllerImplTest,
        ConvertLookupTableToInfolistEntryTest_NoInfolistCase) {
-  InputMethodLookupTable table;
-  table.visible = true;
-  table.page_size = 10;
+  ibus::IBusLookupTable table;
+  table.set_page_size(10);
+
   for (size_t i = 0; i < kSampleCandidateSize; ++i) {
-    table.candidates.push_back(kSampleCandidate[i]);
-    InputMethodLookupTable::Description description;
-    table.descriptions.push_back(description);
+    ibus::IBusLookupTable::Entry entry;
+    entry.value = kSampleCandidate[i];
+    table.mutable_candidates()->push_back(entry);
   }
-  table.cursor_absolute_index = 1;
+  table.set_cursor_position(1);
 
   std::vector<InfolistWindowView::Entry> infolist_entries;
   size_t focused_index = 0;
 
   TestableCandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
       table,
       &infolist_entries,
       &focused_index);
 
   EXPECT_TRUE(infolist_entries.empty());
@@ skipping 85 matching lines @@
   EXPECT_TRUE(TestableCandidateWindowControllerImpl::ShouldUpdateInfolist(
       old_entry,
       InfolistWindowView::InvalidFocusIndex(),
       new_entry,
       InfolistWindowView::InvalidFocusIndex()));
   new_entry.clear();
 }
 
 }  // namespace input_method
 }  // namespace chromeos