Fix some string16 -> base::string16 that have crept into ui/.

ui/views/controls/link.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 "ui/views/controls/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 154 matching lines @@
   Label::OnBlur();
   // We render differently focused.
   SchedulePaint();
 }
 
 void Link::SetFont(const gfx::Font& font) {
   Label::SetFont(font);
   RecalculateFont();
 }
 
-void Link::SetText(const string16& text) {
+void Link::SetText(const base::string16& text) {
   Label::SetText(text);
   // Disable focusability for empty links.  Otherwise Label::GetInsets() will
   // give them an unconditional 1-px. inset on every side to allow for a focus
   // border, when in this case we probably wanted zero width.
   SetFocusable(!text.empty());
 }
 
 void Link::SetEnabledColor(SkColor color) {
   requested_enabled_color_ = color;
   if (!pressed_)
@@ skipping 48 matching lines @@
 void Link::RecalculateFont() {
   // Underline the link iff it is enabled and |underline_| is true.
   const int style = font().GetStyle();
   const int intended_style = (enabled() && underline_) ?
       (style | gfx::Font::UNDERLINE) : (style & ~gfx::Font::UNDERLINE);
   if (style != intended_style)
     Label::SetFont(font().DeriveFont(0, intended_style));
 }
 
 }  // namespace views