Move Range code to gfx.

chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/textinput_test_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 19 matching lines @@
 
   ASSERT_TRUE(content::ExecuteScript(
       tab,
       "document.getElementById('text_id').focus()"));
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
 
   const string16 sample_text1 = UTF8ToUTF16("abcde");
   const string16 sample_text2 = UTF8ToUTF16("fghij");
   const string16 surrounding_text2 = sample_text1 + sample_text2;
-  ui::Range expected_range1(5, 5);
-  ui::Range expected_range2(10, 10);
+  gfx::Range expected_range1(5, 5);
+  gfx::Range expected_range2(10, 10);
 
   ASSERT_TRUE(helper.GetTextInputClient());
 
   helper.GetTextInputClient()->InsertText(sample_text1);
   helper.WaitForSurroundingTextChanged(sample_text1, expected_range1);
   EXPECT_EQ(sample_text1, helper.GetSurroundingText());
   EXPECT_EQ(expected_range1, helper.GetSelectionRange());
 
   helper.GetTextInputClient()->InsertText(sample_text2);
   helper.WaitForSurroundingTextChanged(surrounding_text2, expected_range2);
@@ skipping 13 matching lines @@
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   ASSERT_TRUE(content::ExecuteScript(
       tab,
       "document.getElementById('text_id').focus()"));
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
 
   const string16 sample_text = UTF8ToUTF16("abcde");
-  ui::Range expected_range(5, 5);
+  gfx::Range expected_range(5, 5);
 
   ui::CompositionText composition_text;
   composition_text.text = sample_text;
   composition_text.selection.set_start(expected_range.length());
   composition_text.selection.set_end(expected_range.length());
 
   ASSERT_TRUE(helper.GetTextInputClient());
   helper.GetTextInputClient()->SetCompositionText(composition_text);
   ASSERT_TRUE(helper.GetTextInputClient()->HasCompositionText());
   // TODO(nona): Make sure there is no IPC from renderer.
@@ skipping 10 matching lines @@
                        FocusToTextContainingTextAreaByClickingCase) {
   TextInputTestHelper helper;
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(FILE_PATH_LITERAL("textinput")),
       base::FilePath(FILE_PATH_LITERAL("textarea_with_preset_text.html")));
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, helper.GetTextInputType());
 
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
-  const ui::Range zero_range(0, 0);
+  const gfx::Range zero_range(0, 0);
 
   // We expect no surrounding texts.
   helper.ClickElement("empty_textarea", tab);
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
   helper.WaitForSurroundingTextChanged(UTF8ToUTF16(""), zero_range);
   EXPECT_TRUE(helper.GetSurroundingText().empty());
   EXPECT_EQ(zero_range, helper.GetSelectionRange());
 
   // Click textarea containing text, so expecting new surrounding text comes.
   helper.ClickElement("filled_textarea", tab);
   const string16 expected_text = UTF8ToUTF16("abcde");
-  const ui::Range expected_range(5, 5);
+  const gfx::Range expected_range(5, 5);
   helper.WaitForSurroundingTextChanged(expected_text, expected_range);
   EXPECT_EQ(expected_text, helper.GetSurroundingText());
   EXPECT_EQ(expected_range, helper.GetSelectionRange());
 
   // Then, back to empty text area: expecting empty string.
   helper.ClickElement("empty_textarea", tab);
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
   helper.WaitForSurroundingTextChanged(UTF8ToUTF16(""), zero_range);
   EXPECT_TRUE(helper.GetSurroundingText().empty());
   EXPECT_EQ(zero_range, helper.GetSelectionRange());
 }
 
 // TODO(nona): Add test for JavaScript focusing to textarea containing text.
 // TODO(nona): Add test for text changing by JavaScript.
 // TODO(nona): Add test for onload focusing to textarea containing text.
 } // namespace chromeos