Move Range code to gfx.

chrome/browser/chromeos/input_method/textinput_test_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_
 
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/base/ime/mock_input_method.h"
 #include "ui/base/ime/text_input_client.h"
-#include "ui/base/range/range.h"
+#include "ui/gfx/range/range.h"
 #include "ui/gfx/rect.h"
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 namespace chromeos {
 
 // The base class of text input testing.
 class TextInputTestBase : public InProcessBrowserTest {
  public:
   TextInputTestBase() {}
   virtual ~TextInputTestBase() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
  private:
   DISALLOW_COPY_AND_ASSIGN(TextInputTestBase);
 };
 
 // Provides text input test utilities.
 class TextInputTestHelper : public ui::MockInputMethod::Observer {
  public:
   TextInputTestHelper();
   virtual ~TextInputTestHelper();
 
   // Returns the latest status notified to ui::InputMethod
   string16 GetSurroundingText() const;
   gfx::Rect GetCaretRect() const;
   gfx::Rect GetCompositionHead() const;
-  ui::Range GetSelectionRange() const;
+  gfx::Range GetSelectionRange() const;
   bool GetFocusState() const;
   ui::TextInputType GetTextInputType() const;
 
   ui::TextInputClient* GetTextInputClient() const;
 
   // Waiting function for each input method events. These functions runs message
   // loop until the expected event comes.
   void WaitForTextInputStateChanged(ui::TextInputType expected_type);
   void WaitForFocus();
   void WaitForBlur();
   void WaitForCaretBoundsChanged(const gfx::Rect& expected_caret_rect,
                                  const gfx::Rect& expected_composition_head);
   void WaitForSurroundingTextChanged(const string16& expected_text,
-                                     const ui::Range& expected_selection);
+                                     const gfx::Range& expected_selection);
 
   // Converts from string to gfx::Rect. The string should be "x,y,width,height".
   // Returns false if the conversion failed.
   static bool ConvertRectFromString(const std::string& str, gfx::Rect* rect);
 
   // Sends mouse clicking event to DOM element which has |id| id.
   static bool ClickElement(const std::string& id, content::WebContents* tab);
 
  private:
   enum WaitImeEventType {
@@ skipping 17 matching lines @@
       const ui::TextInputClient* client) OVERRIDE;
   virtual void OnInputMethodDestroyed(
       const ui::InputMethod* input_method) OVERRIDE;
 
   // Represents waiting type of text input event.
   WaitImeEventType waiting_type_;
 
   string16 surrounding_text_;
   gfx::Rect caret_rect_;
   gfx::Rect composition_head_;
-  ui::Range selection_range_;
+  gfx::Range selection_range_;
   bool focus_state_;
   ui::TextInputType latest_text_input_type_;
 
   DISALLOW_COPY_AND_ASSIGN(TextInputTestHelper);
 };
 
 } // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_