| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 94cd11631a4ba741f25d669ff9bf9d142dcd58f8..74a3ee8537d2c066b6c423247f6bb5ebc76fbc93 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -38,8 +38,8 @@
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| #include "third_party/WebKit/public/web/WebWindowFeatures.h"
|
| #include "ui/base/keycodes/keyboard_codes.h"
|
| -#include "ui/base/range/range.h"
|
| #include "ui/gfx/codec/jpeg_codec.h"
|
| +#include "ui/gfx/range/range.h"
|
|
|
| #if defined(OS_LINUX) && !defined(USE_AURA)
|
| #include "ui/base/gtk/event_synthesis_gtk.h"
|
| @@ -1014,7 +1014,7 @@ TEST_F(RenderViewImplTest, ImeComposition) {
|
| case IME_CONFIRMCOMPOSITION:
|
| view()->OnImeConfirmComposition(
|
| WideToUTF16Hack(ime_message->ime_string),
|
| - ui::Range::InvalidRange(),
|
| + gfx::Range::InvalidRange(),
|
| false);
|
| break;
|
|
|
| @@ -1777,7 +1777,7 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
|
| for (size_t i = 0; i < bounds.size(); ++i)
|
| EXPECT_LT(0, bounds[i].width());
|
| view()->OnImeConfirmComposition(
|
| - empty_string, ui::Range::InvalidRange(), false);
|
| + empty_string, gfx::Range::InvalidRange(), false);
|
|
|
| // Non surrogate pair unicode character.
|
| const string16 unicode_composition = UTF8ToUTF16(
|
| @@ -1788,7 +1788,7 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
|
| for (size_t i = 0; i < bounds.size(); ++i)
|
| EXPECT_LT(0, bounds[i].width());
|
| view()->OnImeConfirmComposition(
|
| - empty_string, ui::Range::InvalidRange(), false);
|
| + empty_string, gfx::Range::InvalidRange(), false);
|
|
|
| // Surrogate pair character.
|
| const string16 surrogate_pair_char = UTF8ToUTF16("\xF0\xA0\xAE\x9F");
|
| @@ -1801,7 +1801,7 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
|
| EXPECT_LT(0, bounds[0].width());
|
| EXPECT_EQ(0, bounds[1].width());
|
| view()->OnImeConfirmComposition(
|
| - empty_string, ui::Range::InvalidRange(), false);
|
| + empty_string, gfx::Range::InvalidRange(), false);
|
|
|
| // Mixed string.
|
| const string16 surrogate_pair_mixed_composition =
|
| @@ -1824,7 +1824,7 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
|
| }
|
| }
|
| view()->OnImeConfirmComposition(
|
| - empty_string, ui::Range::InvalidRange(), false);
|
| + empty_string, gfx::Range::InvalidRange(), false);
|
| }
|
| #endif
|
|
|
|
|