Moves CandidateWindow model to ui/base/ime (2nd)

chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

 // Copyright 2013 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 "base/bind_helpers.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/ibus_text.h"
 #include "chromeos/ime/input_method_descriptor.h"
@@ skipping 519 matching lines @@
         "});";
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(),
         set_candidate_window_properties_test_script));
     EXPECT_EQ(1, mock_candidate_window->update_lookup_table_call_count());
 
     // window visibility is kept as before.
     EXPECT_TRUE(
         mock_candidate_window->last_update_lookup_table_arg().is_visible);
 
-    const CandidateWindow& table =
+    const ui::CandidateWindow& table =
         mock_candidate_window->last_update_lookup_table_arg().lookup_table;
     EXPECT_TRUE(table.is_cursor_visible());
   }
   {
     SCOPED_TRACE("setCandidateWindowProperties:vertical test");
     mock_input_context->Reset();
     mock_candidate_window->Reset();
 
     const char set_candidate_window_properties_test_script[] =
         "chrome.input.ime.setCandidateWindowProperties({"
         "  engineID: engineBridge.getActiveEngineID(),"
         "  properties: {"
         "    vertical: true,"
         "  }"
         "});";
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(),
         set_candidate_window_properties_test_script));
     EXPECT_EQ(1, mock_candidate_window->update_lookup_table_call_count());
 
     // window visibility is kept as before.
     EXPECT_TRUE(
         mock_candidate_window->last_update_lookup_table_arg().is_visible);
 
-    const CandidateWindow& table =
+    const ui::CandidateWindow& table =
         mock_candidate_window->last_update_lookup_table_arg().lookup_table;
 
     // cursor visibility is kept as before.
     EXPECT_TRUE(table.is_cursor_visible());
 
-    EXPECT_EQ(CandidateWindow::VERTICAL, table.orientation());
+    EXPECT_EQ(ui::CandidateWindow::VERTICAL, table.orientation());
   }
   {
     SCOPED_TRACE("setCandidateWindowProperties:pageSize test");
     mock_input_context->Reset();
     mock_candidate_window->Reset();
 
     const char set_candidate_window_properties_test_script[] =
         "chrome.input.ime.setCandidateWindowProperties({"
         "  engineID: engineBridge.getActiveEngineID(),"
         "  properties: {"
         "    pageSize: 7,"
         "  }"
         "});";
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(),
         set_candidate_window_properties_test_script));
     EXPECT_EQ(1, mock_candidate_window->update_lookup_table_call_count());
 
     // window visibility is kept as before.
     EXPECT_TRUE(
         mock_candidate_window->last_update_lookup_table_arg().is_visible);
 
-    const CandidateWindow& table =
+    const ui::CandidateWindow& table =
         mock_candidate_window->last_update_lookup_table_arg().lookup_table;
 
     // cursor visibility is kept as before.
     EXPECT_TRUE(table.is_cursor_visible());
 
     // oritantation is kept as before.
-    EXPECT_EQ(CandidateWindow::VERTICAL, table.orientation());
+    EXPECT_EQ(ui::CandidateWindow::VERTICAL, table.orientation());
 
     EXPECT_EQ(7U, table.page_size());
   }
   {
     SCOPED_TRACE("setCandidateWindowProperties:auxTextVisibility test");
     mock_input_context->Reset();
     mock_candidate_window->Reset();
 
     const char set_candidate_window_properties_test_script[] =
         "chrome.input.ime.setCandidateWindowProperties({"
         "  engineID: engineBridge.getActiveEngineID(),"
         "  properties: {"
         "    auxiliaryTextVisible: true"
         "  }"
         "});";
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(),
         set_candidate_window_properties_test_script));
     EXPECT_EQ(1, mock_candidate_window->update_lookup_table_call_count());
 
-    const input_method::CandidateWindow& table =
+    const ui::CandidateWindow& table =
         mock_candidate_window->last_update_lookup_table_arg().lookup_table;
     EXPECT_TRUE(table.is_auxiliary_text_visible());
   }
   {
     SCOPED_TRACE("setCandidateWindowProperties:auxText test");
     mock_input_context->Reset();
     mock_candidate_window->Reset();
 
     const char set_candidate_window_properties_test_script[] =
         "chrome.input.ime.setCandidateWindowProperties({"
         "  engineID: engineBridge.getActiveEngineID(),"
         "  properties: {"
         "    auxiliaryText: 'AUXILIARY_TEXT'"
         "  }"
         "});";
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(),
         set_candidate_window_properties_test_script));
     EXPECT_EQ(1, mock_candidate_window->update_lookup_table_call_count());
 
     // aux text visibility is kept as before.
-    const input_method::CandidateWindow& table =
+    const ui::CandidateWindow& table =
         mock_candidate_window->last_update_lookup_table_arg().lookup_table;
     EXPECT_TRUE(table.is_auxiliary_text_visible());
     EXPECT_EQ("AUXILIARY_TEXT", table.auxiliary_text());
   }
   {
     SCOPED_TRACE("setCandidates test");
     mock_input_context->Reset();
     mock_candidate_window->Reset();
 
     const char set_candidates_test_script[] =
@@ skipping 22 matching lines @@
         "    }"
         "  }]"
         "});";
     ASSERT_TRUE(content::ExecuteScript(host->host_contents(),
                                        set_candidates_test_script));
 
     // window visibility is kept as before.
     EXPECT_TRUE(
         mock_candidate_window->last_update_lookup_table_arg().is_visible);
 
-    const CandidateWindow& table =
+    const ui::CandidateWindow& table =
         mock_candidate_window->last_update_lookup_table_arg().lookup_table;
 
     // cursor visibility is kept as before.
     EXPECT_TRUE(table.is_cursor_visible());
 
     // oritantation is kept as before.
-    EXPECT_EQ(CandidateWindow::VERTICAL, table.orientation());
+    EXPECT_EQ(ui::CandidateWindow::VERTICAL, table.orientation());
 
     // page size is kept as before.
     EXPECT_EQ(7U, table.page_size());
 
     ASSERT_EQ(4U, table.candidates().size());
 
     EXPECT_EQ("CANDIDATE_1", table.candidates().at(0).value);
 
     EXPECT_EQ("CANDIDATE_2", table.candidates().at(1).value);
     EXPECT_EQ("LABEL_2", table.candidates().at(1).label);
@@ skipping 19 matching lines @@
         "  candidateID: 2"
         "});";
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(), set_cursor_position_test_script));
     EXPECT_EQ(1, mock_candidate_window->update_lookup_table_call_count());
 
     // window visibility is kept as before.
     EXPECT_TRUE(
         mock_candidate_window->last_update_lookup_table_arg().is_visible);
 
-    const CandidateWindow& table =
+    const ui::CandidateWindow& table =
         mock_candidate_window->last_update_lookup_table_arg().lookup_table;
 
     // cursor visibility is kept as before.
     EXPECT_TRUE(table.is_cursor_visible());
 
     // oritantation is kept as before.
-    EXPECT_EQ(CandidateWindow::VERTICAL, table.orientation());
+    EXPECT_EQ(ui::CandidateWindow::VERTICAL, table.orientation());
 
     // page size is kept as before.
     EXPECT_EQ(7U, table.page_size());
 
     // candidates are same as before.
     ASSERT_EQ(4U, table.candidates().size());
 
     // Candidate ID == 2 is 1 in index.
     EXPECT_EQ(1U, table.cursor_position());
   }
@@ skipping 126 matching lines @@
     }
   }
 
   IBusBridge::Get()->SetInputContextHandler(NULL);
   IBusBridge::Get()->SetCandidateWindowHandler(NULL);
 }
 
 }  // namespace
 }  // namespace input_method
 }  // namespace chromeos