Move text_elider to gfx.

ui/views/corewm/tooltip_controller_unittest.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 "ui/views/corewm/tooltip_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/tooltip_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
+#include "ui/gfx/text_elider.h"
 #include "ui/views/corewm/tooltip_controller_test_helper.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
@@ skipping 238 matching lines @@
 
 #if !defined(OS_WIN)
   // Tooltip with really long word gets elided.
   tooltip.clear();
   width = line_count = -1;
   tooltip = UTF8ToUTF16(std::string('a', max_pixel_width));
   TooltipControllerTestHelper::TrimTooltipToFit(
       max_width, &tooltip, &width, &line_count);
   EXPECT_NEAR(max_pixel_width, width, 5);
   EXPECT_EQ(1, line_count);
-  EXPECT_EQ(ui::ElideText(UTF8ToUTF16(std::string('a', max_pixel_width)), font,
-                          max_pixel_width, ui::ELIDE_AT_END), tooltip);
+  EXPECT_EQ(gfx::ElideText(UTF8ToUTF16(std::string('a', max_pixel_width)), font,
+                          max_pixel_width, gfx::ELIDE_AT_END), tooltip);
 #endif
 
   // Normal small tooltip should stay as is.
   tooltip.clear();
   width = line_count = -1;
   tooltip = ASCIIToUTF16("Small Tooltip");
   TooltipControllerTestHelper::TrimTooltipToFit(
       max_width, &tooltip, &width, &line_count);
   EXPECT_EQ(font.GetStringWidth(ASCIIToUTF16("Small Tooltip")), width);
   EXPECT_EQ(1, line_count);
@@ skipping 133 matching lines @@
   helper_->FireTooltipTimer();
 
   EXPECT_TRUE(helper_->IsTooltipVisible());
   generator_->SendMouseExit();
   EXPECT_FALSE(helper_->IsTooltipVisible());
 }
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views