From ed95e02da69e469de255362cdb4114fe8e4c0c64 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Thu, 11 Apr 2013 04:03:32 +0000 Subject: Update src/ash/ for renames and moves in base Renames string16 -> base::string16 and base/string_number_conversions.h -> base/strings/string_number_conversions.h BUG= Review URL: https://codereview.chromium.org/13856005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193561 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/tooltips/tooltip_controller_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ash/tooltips') diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 4cc07b8..18ceb17 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -99,7 +99,7 @@ class TooltipControllerTest : public AshTestBase { TEST_F(TooltipControllerTest, NonNullTooltipClient) { EXPECT_TRUE(aura::client::GetTooltipClient(Shell::GetPrimaryRootWindow()) != NULL); - EXPECT_EQ(string16(), helper_->GetTooltipText()); + EXPECT_EQ(base::string16(), helper_->GetTooltipText()); EXPECT_EQ(NULL, helper_->GetTooltipWindow()); EXPECT_FALSE(helper_->IsTooltipVisible()); } @@ -109,13 +109,13 @@ TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) { TooltipTestView* view = new TooltipTestView; AddViewToWidgetAndResize(widget.get(), view); view->set_tooltip_text(ASCIIToUTF16("Tooltip Text")); - EXPECT_EQ(string16(), helper_->GetTooltipText()); + EXPECT_EQ(base::string16(), helper_->GetTooltipText()); EXPECT_EQ(NULL, helper_->GetTooltipWindow()); aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); generator.MoveMouseRelativeTo(widget->GetNativeView(), view->bounds().CenterPoint()); - string16 expected_tooltip = ASCIIToUTF16("Tooltip Text"); + base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text"); // Fire tooltip timer so tooltip becomes visible. helper_->FireTooltipTimer(); -- cgit v1.1