ui/app_list: Use base::string16 now that string16 was moved into base namespace.

base/string16.h was moved into base namespace in r191198 by Brett.

BUG=None
TBR=ben@chromium.org,xiyuan@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16945004

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

2 files changed, 6 insertions, 6 deletions

diff --git a/ui/app_list/test/app_list_test_view_delegate.cc b/ui/app_list/test/app_list_test_view_delegate.cc
index 5569c09..6012933 100644
--- a/ui/app_list/test/app_list_test_view_delegate.cc
+++ b/ui/app_list/test/app_list_test_view_delegate.cc
@@ -35,12 +35,12 @@ gfx::ImageSkia AppListTestViewDelegate::GetWindowIcon() {
   return gfx::ImageSkia();
 }
 
-string16 AppListTestViewDelegate::GetCurrentUserName() {
-  return string16();
+base::string16 AppListTestViewDelegate::GetCurrentUserName() {
+  return base::string16();
 }
 
-string16 AppListTestViewDelegate::GetCurrentUserEmail() {
-  return string16();
+base::string16 AppListTestViewDelegate::GetCurrentUserEmail() {
+  return base::string16();
 }
 
 }  // namespace test
diff --git a/ui/app_list/test/app_list_test_view_delegate.h b/ui/app_list/test/app_list_test_view_delegate.h
index c3ca18a..f28fb050 100644
--- a/ui/app_list/test/app_list_test_view_delegate.h
+++ b/ui/app_list/test/app_list_test_view_delegate.h
@@ -37,8 +37,8 @@ class AppListTestViewDelegate  : public AppListViewDelegate {
   virtual void ViewClosing() OVERRIDE {}
   virtual void ViewActivationChanged(bool active) OVERRIDE {}
   virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
-  virtual string16 GetCurrentUserName() OVERRIDE;
-  virtual string16 GetCurrentUserEmail() OVERRIDE;
+  virtual base::string16 GetCurrentUserName() OVERRIDE;
+  virtual base::string16 GetCurrentUserEmail() OVERRIDE;
   virtual void OpenSettings() OVERRIDE {}
   virtual void OpenHelp() OVERRIDE {}
   virtual void OpenFeedback() OVERRIDE {}