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

TBR=sky@chromium.org
BUG=329295

Review URL: https://codereview.chromium.org/113203004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242096 0039d316-1c4b-4281-b951-d872f2087c98

ui/views/controls/label.cc

@@ -233,7 +233,7 @@ gfx::Size Label::GetMinimumSize() {
   if ((!visible() && collapse_when_hidden_) || text_size.IsEmpty())
     return gfx::Size();
 
-  gfx::Size size(font_list_.GetStringWidth(string16(gfx::kEllipsisUTF16)),
+  gfx::Size size(font_list_.GetStringWidth(base::string16(gfx::kEllipsisUTF16)),
                  font_list_.GetHeight());
   size.SetToMin(text_size);  // The actual text may be shorter than an ellipsis.
   gfx::Insets insets = GetInsets();

ui/views/controls/link.cc

@@ -172,7 +172,7 @@ void Link::SetFont(const gfx::Font& 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

ui/views/controls/link.h

@@ -51,7 +51,7 @@ class VIEWS_EXPORT Link : public Label {
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
   virtual void SetFont(const gfx::Font& font) OVERRIDE;
-  virtual void SetText(const string16& text) OVERRIDE;
+  virtual void SetText(const base::string16& text) OVERRIDE;
   virtual void SetEnabledColor(SkColor color) OVERRIDE;
 
   void SetPressedColor(SkColor color);