Move Range code to gfx.

chrome/browser/chromeos/input_method/textinput_test_helper.cc

 // Copyright (c) 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 "ash/shell.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/textinput_test_helper.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 15 matching lines @@
   return input_method;
 }
 }  // namespace
 
 void TextInputTestBase::SetUpInProcessBrowserTestFixture() {
   ui::SetUpInputMethodFactoryForTesting();
 }
 
 TextInputTestHelper::TextInputTestHelper()
   : waiting_type_(NO_WAIT),
-    selection_range_(ui::Range::InvalidRange()),
+    selection_range_(gfx::Range::InvalidRange()),
     focus_state_(false),
     latest_text_input_type_(ui::TEXT_INPUT_TYPE_NONE) {
   GetInputMethod()->AddObserver(this);
 }
 
 TextInputTestHelper::~TextInputTestHelper() {
   GetInputMethod()->RemoveObserver(this);
 }
 
 string16 TextInputTestHelper::GetSurroundingText() const {
   return surrounding_text_;
 }
 
 gfx::Rect TextInputTestHelper::GetCaretRect() const {
   return caret_rect_;
 }
 
 gfx::Rect TextInputTestHelper::GetCompositionHead() const {
   return composition_head_;
 }
 
-ui::Range TextInputTestHelper::GetSelectionRange() const {
+gfx::Range TextInputTestHelper::GetSelectionRange() const {
   return selection_range_;
 }
 
 bool TextInputTestHelper::GetFocusState() const {
   return focus_state_;
 }
 
 ui::TextInputType TextInputTestHelper::GetTextInputType() const {
   return latest_text_input_type_;
 }
@@ skipping 24 matching lines @@
   if (waiting_type_ == WAIT_ON_BLUR)
     base::MessageLoop::current()->Quit();
 }
 
 void TextInputTestHelper::OnUntranslatedIMEMessage(
   const base::NativeEvent& event) {
 }
 
 void TextInputTestHelper::OnCaretBoundsChanged(
     const ui::TextInputClient* client) {
-  ui::Range text_range;
+  gfx::Range text_range;
   if (!GetTextInputClient()->GetTextRange(&text_range) ||
       !GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text_) ||
       !GetTextInputClient()->GetSelectionRange(&selection_range_))
       return;
   if (waiting_type_ == WAIT_ON_CARET_BOUNDS_CHANGED)
     base::MessageLoop::current()->Quit();
 }
 
 void TextInputTestHelper::OnInputLocaleChanged() {
 }
@@ skipping 32 matching lines @@
     const gfx::Rect& expected_composition_head) {
   waiting_type_ = WAIT_ON_CARET_BOUNDS_CHANGED;
   while (expected_caret_rect != caret_rect_ ||
          expected_composition_head != composition_head_)
     content::RunMessageLoop();
   waiting_type_ = NO_WAIT;
 }
 
 void TextInputTestHelper::WaitForSurroundingTextChanged(
     const string16& expected_text,
-    const ui::Range& expected_selection) {
+    const gfx::Range& expected_selection) {
   waiting_type_ = WAIT_ON_CARET_BOUNDS_CHANGED;
   while (expected_text != surrounding_text_ ||
          expected_selection != selection_range_)
     content::RunMessageLoop();
   waiting_type_ = NO_WAIT;
 }
 
 // static
 bool TextInputTestHelper::ConvertRectFromString(const std::string& str,
                                                 gfx::Rect* rect) {
@@ skipping 34 matching lines @@
   mouse_event.y = rect.CenterPoint().y();
   mouse_event.clickCount = 1;
   tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
 
   mouse_event.type = WebKit::WebInputEvent::MouseUp;
   tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
   return true;
 }
 
 } // namespace chromeos