Prefix string16 with base:: in ui/.

ui/views/corewm/tooltip_controller_test_helper.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_test_helper.h"
 
 #include "ui/aura/window.h"
 #include "ui/views/corewm/tooltip_controller.h"
 
 namespace views {
 namespace corewm {
 namespace test {
 
 TooltipControllerTestHelper::TooltipControllerTestHelper(
     TooltipController* controller)
     : controller_(controller) {
 }
 
 TooltipControllerTestHelper::~TooltipControllerTestHelper() {
 }
 
-string16 TooltipControllerTestHelper::GetTooltipText() {
+base::string16 TooltipControllerTestHelper::GetTooltipText() {
   return controller_->tooltip_text_;
 }
 
 aura::Window* TooltipControllerTestHelper::GetTooltipWindow() {
   return controller_->tooltip_window_;
 }
 
 void TooltipControllerTestHelper::FireTooltipTimer() {
   controller_->TooltipTimerFired();
 }
@@ skipping 15 matching lines @@
   return controller_->IsTooltipVisible();
 }
 
 TooltipTestView::TooltipTestView() {
 }
 
 TooltipTestView::~TooltipTestView() {
 }
 
 bool TooltipTestView::GetTooltipText(const gfx::Point& p,
-                                     string16* tooltip) const {
+                                     base::string16* tooltip) const {
   *tooltip = tooltip_text_;
   return true;
 }
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views