Move Range code to gfx.

ui/base/ime/input_method_ibus_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 <X11/Xlib.h>
 #undef Bool
 #undef FocusIn
 #undef FocusOut
 #undef None
 
@@ skipping 401 matching lines @@
     return caret_bounds_;
   }
   virtual bool GetCompositionCharacterBounds(uint32 index,
                                              gfx::Rect* rect) OVERRIDE {
     return false;
   }
   virtual bool HasCompositionText() OVERRIDE {
     CompositionText empty;
     return composition_text_ != empty;
   }
-  virtual bool GetTextRange(Range* range) OVERRIDE {
+  virtual bool GetTextRange(gfx::Range* range) OVERRIDE {
     *range = text_range_;
     return true;
   }
-  virtual bool GetCompositionTextRange(Range* range) OVERRIDE { return false; }
-  virtual bool GetSelectionRange(Range* range) OVERRIDE {
+  virtual bool GetCompositionTextRange(gfx::Range* range) OVERRIDE { return false; }
+  virtual bool GetSelectionRange(gfx::Range* range) OVERRIDE {
     *range = selection_range_;
     return true;
   }
 
-  virtual bool SetSelectionRange(const Range& range) OVERRIDE { return false; }
-  virtual bool DeleteRange(const Range& range) OVERRIDE { return false; }
-  virtual bool GetTextFromRange(const Range& range, string16* text) OVERRIDE {
+  virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE { return false; }
+  virtual bool DeleteRange(const gfx::Range& range) OVERRIDE { return false; }
+  virtual bool GetTextFromRange(const gfx::Range& range, string16* text) OVERRIDE {
     *text = surrounding_text_.substr(range.GetMin(), range.length());
     return true;
   }
   virtual void OnInputMethodChanged() OVERRIDE {
     ++on_input_method_changed_call_count_;
   }
   virtual bool ChangeTextDirectionAndLayoutAlignment(
       base::i18n::TextDirection direction) OVERRIDE { return false; }
   virtual void ExtendSelectionAndDelete(size_t before,
                                         size_t after) OVERRIDE { }
@@ skipping 49 matching lines @@
   CompositionText confirmed_text_;
   string16 inserted_text_;
   char16 inserted_char_;
   unsigned int on_input_method_changed_call_count_;
   int inserted_char_flags_;
 
   // Variables that will be returned from the ui::TextInputClient functions.
   TextInputType input_type_;
   bool can_compose_inline_;
   gfx::Rect caret_bounds_;
-  ui::Range text_range_;
-  ui::Range selection_range_;
+  gfx::Range text_range_;
+  gfx::Range selection_range_;
   string16 surrounding_text_;
 
   // Variables for mock dbus connections.
   chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_;
   chromeos::MockIBusClient* mock_ibus_client_;
   chromeos::MockIBusInputContextClient* mock_ibus_input_context_client_;
   chromeos::MockIBusDaemonController* mock_ibus_daemon_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodIBusTest);
 };
@@ skipping 605 matching lines @@
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
   // Start the daemon.
   InitIBusBus();
   SetCreateContextSuccessHandler();
   mock_ibus_daemon_controller_->EmulateConnect();
 
   // Set the TextInputClient behaviors.
   surrounding_text_ = UTF8ToUTF16("abcdef");
-  text_range_ = ui::Range(0, 6);
-  selection_range_ = ui::Range(3, 3);
+  text_range_ = gfx::Range(0, 6);
+  selection_range_ = gfx::Range(3, 3);
 
   // Set the verifier for SetSurroundingText mock call.
   SetSurroundingTextVerifier verifier(UTF16ToUTF8(surrounding_text_), 3, 3);
 
 
   mock_ibus_input_context_client_->set_set_surrounding_text_handler(
       base::Bind(&SetSurroundingTextVerifier::Verify,
                  base::Unretained(&verifier)));
   ime_->OnCaretBoundsChanged(this);
 
   // Check the call count.
   EXPECT_EQ(1,
             mock_ibus_input_context_client_->set_surrounding_text_call_count());
 }
 
 TEST_F(InputMethodIBusTest, SurroundingText_SelectionTest) {
   ime_->Init(true);
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
   // Start the daemon.
   InitIBusBus();
   SetCreateContextSuccessHandler();
   mock_ibus_daemon_controller_->EmulateConnect();
 
   // Set the TextInputClient behaviors.
   surrounding_text_ = UTF8ToUTF16("abcdef");
-  text_range_ = ui::Range(0, 6);
-  selection_range_ = ui::Range(2, 5);
+  text_range_ = gfx::Range(0, 6);
+  selection_range_ = gfx::Range(2, 5);
 
   // Set the verifier for SetSurroundingText mock call.
   SetSurroundingTextVerifier verifier(UTF16ToUTF8(surrounding_text_), 2, 5);
 
   mock_ibus_input_context_client_->set_set_surrounding_text_handler(
       base::Bind(&SetSurroundingTextVerifier::Verify,
                  base::Unretained(&verifier)));
   ime_->OnCaretBoundsChanged(this);
 
   // Check the call count.
   EXPECT_EQ(1,
             mock_ibus_input_context_client_->set_surrounding_text_call_count());
 }
 
 TEST_F(InputMethodIBusTest, SurroundingText_PartialText) {
   ime_->Init(true);
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
   // Start the daemon.
   InitIBusBus();
   SetCreateContextSuccessHandler();
   mock_ibus_daemon_controller_->EmulateConnect();
 
   // Set the TextInputClient behaviors.
   surrounding_text_ = UTF8ToUTF16("abcdefghij");
-  text_range_ = ui::Range(5, 10);
-  selection_range_ = ui::Range(7, 9);
+  text_range_ = gfx::Range(5, 10);
+  selection_range_ = gfx::Range(7, 9);
 
   // Set the verifier for SetSurroundingText mock call.
   // Here (2, 4) is selection range in expected surrounding text coordinates.
   SetSurroundingTextVerifier verifier("fghij", 2, 4);
 
   mock_ibus_input_context_client_->set_set_surrounding_text_handler(
       base::Bind(&SetSurroundingTextVerifier::Verify,
                  base::Unretained(&verifier)));
   ime_->OnCaretBoundsChanged(this);
 
   // Check the call count.
   EXPECT_EQ(1,
             mock_ibus_input_context_client_->set_surrounding_text_call_count());
 }
 
 TEST_F(InputMethodIBusTest, SurroundingText_BecomeEmptyText) {
   ime_->Init(true);
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
   // Start the daemon.
   InitIBusBus();
   SetCreateContextSuccessHandler();
   mock_ibus_daemon_controller_->EmulateConnect();
 
   // Set the TextInputClient behaviors.
   // If the surrounding text becomes empty, text_range become (0, 0) and
   // selection range become invalid.
   surrounding_text_ = UTF8ToUTF16("");
-  text_range_ = ui::Range(0, 0);
-  selection_range_ = ui::Range::InvalidRange();
+  text_range_ = gfx::Range(0, 0);
+  selection_range_ = gfx::Range::InvalidRange();
 
   // Set the verifier for SetSurroundingText mock call.
   SetSurroundingTextVerifier verifier("", 0, 0);
 
   mock_ibus_input_context_client_->set_set_surrounding_text_handler(
       base::Bind(&SetSurroundingTextVerifier::Verify,
                  base::Unretained(&verifier)));
   ime_->OnCaretBoundsChanged(this);
 
   // Check the call count.
@@ skipping 471 matching lines @@
 
   // Do callback.
   success_consume_handler.RunCallback(KEYEVENT_CONSUME);
 
   EXPECT_EQ(0, ime_->process_key_event_post_ime_call_count());
 }
 
 // TODO(nona): Introduce ProcessKeyEventPostIME tests(crbug.com/156593).
 
 }  // namespace ui