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

7 files changed, 19 insertions, 15 deletions

diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc
index cc86459..9421e59 100644
--- a/ash/test/test_launcher_delegate.cc
+++ b/ash/test/test_launcher_delegate.cc
@@ -79,9 +79,9 @@ int TestLauncherDelegate::GetBrowserShortcutResourceId() {
   return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
 }
 
-string16 TestLauncherDelegate::GetTitle(const ash::LauncherItem& item) {
+base::string16 TestLauncherDelegate::GetTitle(const ash::LauncherItem& item) {
   aura::Window* window = GetWindowByID(item.id);
-  return window ? window->title() : string16();
+  return window ? window->title() : base::string16();
 }
 
 ui::MenuModel* TestLauncherDelegate::CreateContextMenu(
diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h
index ccbca32..ef90495 100644
--- a/ash/test/test_launcher_delegate.h
+++ b/ash/test/test_launcher_delegate.h
@@ -39,7 +39,7 @@ class TestLauncherDelegate : public LauncherDelegate,
   virtual void ItemClicked(const LauncherItem& item,
                            const ui::Event& event) OVERRIDE;
   virtual int GetBrowserShortcutResourceId() OVERRIDE;
-  virtual string16 GetTitle(const LauncherItem& item) OVERRIDE;
+  virtual base::string16 GetTitle(const LauncherItem& item) OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(const LauncherItem& item,
                                            aura::RootWindow* root) OVERRIDE;
   virtual ash::LauncherMenuModel* CreateApplicationMenu(
diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc
index 3d58f6f..270c233 100644
--- a/ash/test/test_metro_viewer_process_host.cc
+++ b/ash/test/test_metro_viewer_process_host.cc
@@ -62,7 +62,7 @@ void TestMetroViewerProcessHost::NotifyChannelConnected() {
 }
 
 bool TestMetroViewerProcessHost::LaunchViewerAndWaitForConnection(
-    const string16& app_user_model_id) {
+    const base::string16& app_user_model_id) {
   // Activate the viewer process. NOTE: This assumes that the viewer process is
   // registered as the default browser using the provided |app_user_model_id|.
 
diff --git a/ash/test/test_metro_viewer_process_host.h b/ash/test/test_metro_viewer_process_host.h
index de0969e..f52230b 100644
--- a/ash/test/test_metro_viewer_process_host.h
+++ b/ash/test/test_metro_viewer_process_host.h
@@ -32,7 +32,8 @@ class TestMetroViewerProcessHost : public IPC::Listener,
   // and blocks until that viewer process connects or until a timeout is
   // reached. Returns true if the viewer process connects before the timeout is
   // reached.
-  bool LaunchViewerAndWaitForConnection(const string16& app_user_model_id);
+  bool LaunchViewerAndWaitForConnection(
+      const base::string16& app_user_model_id);
 
   // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index feccd6b..6ec196d 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -200,12 +200,14 @@ void TestShellDelegate::HandleMediaPlayPause() {
 void TestShellDelegate::HandleMediaPrevTrack() {
 }
 
-string16 TestShellDelegate::GetTimeRemainingString(base::TimeDelta delta) {
-  return string16();
+base::string16 TestShellDelegate::GetTimeRemainingString(
+    base::TimeDelta delta) {
+  return base::string16();
 }
 
-string16 TestShellDelegate::GetTimeDurationLongString(base::TimeDelta delta) {
-  return string16();
+base::string16 TestShellDelegate::GetTimeDurationLongString(
+    base::TimeDelta delta) {
+  return base::string16();
 }
 
 void TestShellDelegate::SaveScreenMagnifierScale(double scale) {
@@ -239,8 +241,8 @@ void TestShellDelegate::SetCanLockScreen(bool can_lock_screen) {
   can_lock_screen_ = can_lock_screen;
 }
 
-string16 TestShellDelegate::GetProductName() const {
-  return string16();
+base::string16 TestShellDelegate::GetProductName() const {
+  return base::string16();
 }
 
 
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 98706bd..269d571 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -73,13 +73,14 @@ class TestShellDelegate : public ShellDelegate {
   virtual void HandleMediaNextTrack() OVERRIDE;
   virtual void HandleMediaPlayPause() OVERRIDE;
   virtual void HandleMediaPrevTrack() OVERRIDE;
-  virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
-  virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;
+  virtual base::string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
+  virtual base::string16 GetTimeDurationLongString(
+      base::TimeDelta delta) OVERRIDE;
   virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
   virtual double GetSavedScreenMagnifierScale() OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
   virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
-  virtual string16 GetProductName() const OVERRIDE;
+  virtual base::string16 GetProductName() const OVERRIDE;
 
   int num_exit_requests() const { return num_exit_requests_; }
 
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index a42a685..458aaeb 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -47,7 +47,7 @@ void AuraShellTestSuite::Initialize() {
 
     ui::win::CreateATLModuleIfNeeded();
 
-    std::vector<string16> choices;
+    std::vector<base::string16> choices;
     win8::OpenWithDialogController controller;
     controller.RunSynchronously(NULL, L"http", win8::test::kDefaultTestExeName,
                                 &choices);