Move Range code to gfx.

content/renderer/render_view_browsertest.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 "base/basictypes.h"
 
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/ssl_status_serialization.h"
@@ skipping 20 matching lines @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #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"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/base/events/event.h"
 #endif
 
 #if defined(USE_AURA) && defined(USE_X11)
@@ skipping 954 matching lines @@
         view()->OnImeSetComposition(
             WideToUTF16Hack(ime_message->ime_string),
             std::vector<WebKit::WebCompositionUnderline>(),
             ime_message->selection_start,
             ime_message->selection_end);
         break;
 
       case IME_CONFIRMCOMPOSITION:
         view()->OnImeConfirmComposition(
             WideToUTF16Hack(ime_message->ime_string),
-            ui::Range::InvalidRange(),
+            gfx::Range::InvalidRange(),
             false);
         break;
 
       case IME_CANCELCOMPOSITION:
         view()->OnImeSetComposition(
             string16(),
             std::vector<WebKit::WebCompositionUnderline>(),
             0, 0);
         break;
     }
@@ skipping 742 matching lines @@
   view()->OnSetInputMethodActive(true);
 
   // ASCII composition
   const string16 ascii_composition = UTF8ToUTF16("aiueo");
   view()->OnImeSetComposition(ascii_composition, empty_underline, 0, 0);
   view()->GetCompositionCharacterBounds(&bounds);
   ASSERT_EQ(ascii_composition.size(), bounds.size());
   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(
       "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A");
   view()->OnImeSetComposition(unicode_composition, empty_underline, 0, 0);
   view()->GetCompositionCharacterBounds(&bounds);
   ASSERT_EQ(unicode_composition.size(), bounds.size());
   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");
   view()->OnImeSetComposition(surrogate_pair_char,
                               empty_underline,
                               0,
                               0);
   view()->GetCompositionCharacterBounds(&bounds);
   ASSERT_EQ(surrogate_pair_char.size(), bounds.size());
   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 =
       surrogate_pair_char + UTF8ToUTF16("\xE3\x81\x82") + surrogate_pair_char +
       UTF8ToUTF16("b") + surrogate_pair_char;
   const size_t utf16_length = 8UL;
   const bool is_surrogate_pair_empty_rect[8] = {
     false, true, false, false, true, false, false, true };
   view()->OnImeSetComposition(surrogate_pair_mixed_composition,
                               empty_underline,
                               0,
                               0);
   view()->GetCompositionCharacterBounds(&bounds);
   ASSERT_EQ(utf16_length, bounds.size());
   for (size_t i = 0; i < utf16_length; ++i) {
     if (is_surrogate_pair_empty_rect[i]) {
       EXPECT_EQ(0, bounds[i].width());
     } else {
       EXPECT_LT(0, bounds[i].width());
     }
   }
   view()->OnImeConfirmComposition(
-      empty_string, ui::Range::InvalidRange(), false);
+      empty_string, gfx::Range::InvalidRange(), false);
 }
 #endif
 
 TEST_F(RenderViewImplTest, ZoomLimit) {
   const double kMinZoomLevel = ZoomFactorToZoomLevel(kMinimumZoomFactor);
   const double kMaxZoomLevel = ZoomFactorToZoomLevel(kMaximumZoomFactor);
 
   ViewMsg_Navigate_Params params;
   params.page_id = -1;
   params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
@@ skipping 106 matching lines @@
   EXPECT_FALSE(net::IsCertStatusError(ssl_status.cert_status));
 
   const_cast<WebKit::WebURLResponse&>(frame->dataSource()->response()).
       setSecurityInfo(
           SerializeSecurityInfo(0, net::CERT_STATUS_ALL_ERRORS, 0, 0));
   ssl_status = view()->GetSSLStatusOfFrame(frame);
   EXPECT_TRUE(net::IsCertStatusError(ssl_status.cert_status));
 }
 
 }  // namespace content