Move Range code to gfx.

ui/base/ime/win/tsf_text_store_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 "ui/base/ime/win/tsf_text_store.h"
 
 #include "base/win/scoped_com_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/ime/text_input_client.h"
@@ skipping 15 matching lines @@
   MOCK_METHOD0(ClearCompositionText, void());
   MOCK_METHOD1(InsertText, void(const string16&));
   MOCK_METHOD2(InsertChar, void(char16, int));
   MOCK_CONST_METHOD0(GetAttachedWindow, gfx::NativeWindow());
   MOCK_CONST_METHOD0(GetTextInputType, ui::TextInputType());
   MOCK_CONST_METHOD0(GetTextInputMode, ui::TextInputMode());
   MOCK_CONST_METHOD0(CanComposeInline, bool());
   MOCK_METHOD0(GetCaretBounds, gfx::Rect());
   MOCK_METHOD2(GetCompositionCharacterBounds, bool(uint32, gfx::Rect*));
   MOCK_METHOD0(HasCompositionText, bool());
-  MOCK_METHOD1(GetTextRange, bool(ui::Range*));
-  MOCK_METHOD1(GetCompositionTextRange, bool(ui::Range*));
-  MOCK_METHOD1(GetSelectionRange, bool(ui::Range*));
-  MOCK_METHOD1(SetSelectionRange, bool(const ui::Range&));
-  MOCK_METHOD1(DeleteRange, bool(const ui::Range&));
-  MOCK_METHOD2(GetTextFromRange, bool(const ui::Range&, string16*));
+  MOCK_METHOD1(GetTextRange, bool(gfx::Range*));
+  MOCK_METHOD1(GetCompositionTextRange, bool(gfx::Range*));
+  MOCK_METHOD1(GetSelectionRange, bool(gfx::Range*));
+  MOCK_METHOD1(SetSelectionRange, bool(const gfx::Range&));
+  MOCK_METHOD1(DeleteRange, bool(const gfx::Range&));
+  MOCK_METHOD2(GetTextFromRange, bool(const gfx::Range&, string16*));
   MOCK_METHOD0(OnInputMethodChanged, void());
   MOCK_METHOD1(ChangeTextDirectionAndLayoutAlignment,
                bool(base::i18n::TextDirection));
   MOCK_METHOD2(ExtendSelectionAndDelete, void(size_t, size_t));
   MOCK_METHOD1(EnsureCaretInRect, void(const gfx::Rect&));
 };
 
 class MockStoreACPSink : public ITextStoreACPSink {
  public:
   MockStoreACPSink() : ref_count_(0) {
@@ skipping 80 matching lines @@
       : text_store_(text_store) {
     CHECK(text_store_);
   }
   virtual ~TSFTextStoreTestCallback() {}
 
  protected:
   // Accessors to the internal state of TSFTextStore.
   bool* edit_flag() { return &text_store_->edit_flag_; }
   string16* string_buffer() { return &text_store_->string_buffer_; }
   size_t* committed_size() { return &text_store_->committed_size_; }
-  Range* selection() { return &text_store_->selection_; }
+  gfx::Range* selection() { return &text_store_->selection_; }
   CompositionUnderlines* composition_undelines() {
     return &text_store_->composition_undelines_;
   }
 
   void SetInternalState(const string16& new_string_buffer,
                         LONG new_committed_size, LONG new_selection_start,
                         LONG new_selection_end) {
     ASSERT_LE(0, new_committed_size);
     ASSERT_LE(new_committed_size, new_selection_start);
     ASSERT_LE(new_selection_start, new_selection_end);
@@ skipping 986 matching lines @@
                  &GetTextExtTestCallback::GetCompositionCharacterBounds));
 
   EXPECT_CALL(*sink_, OnLockGranted(_))
       .WillOnce(Invoke(&callback, &GetTextExtTestCallback::LockGranted));
 
   HRESULT result;
   EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
 }
 
 }  // namespace ui