Prefix string16 with base:: in ash/.

R=sky@chromium.org
BUG=329295

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

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

6 files changed, 14 insertions, 14 deletions

diff --git a/ash/system/chromeos/audio/tray_audio.cc b/ash/system/chromeos/audio/tray_audio.cc
index 3dbd815..67f7886 100644
--- a/ash/system/chromeos/audio/tray_audio.cc
+++ b/ash/system/chromeos/audio/tray_audio.cc
@@ -486,7 +486,7 @@ class AudioDetailedView : public TrayDetailsView,
     scroller()->Layout();
   }
 
-  void AddScrollListInfoItem(const string16& text) {
+  void AddScrollListInfoItem(const base::string16& text) {
     views::Label* label = new views::Label(text);
 
     //  Align info item with checkbox items
@@ -511,7 +511,7 @@ class AudioDetailedView : public TrayDetailsView,
     scroll_content()->AddChildView(label);
   }
 
-  HoverHighlightView* AddScrollListItem(const string16& text,
+  HoverHighlightView* AddScrollListItem(const base::string16& text,
                                         gfx::Font::FontStyle style,
                                         bool checked) {
     HoverHighlightView* container = new HoverHighlightView(this);
diff --git a/ash/system/chromeos/managed/tray_locally_managed_user.cc b/ash/system/chromeos/managed/tray_locally_managed_user.cc
index bd3e380..e9f44a5 100644
--- a/ash/system/chromeos/managed/tray_locally_managed_user.cc
+++ b/ash/system/chromeos/managed/tray_locally_managed_user.cc
@@ -81,7 +81,7 @@ void TrayLocallyManagedUser::CreateOrUpdateNotification(
   scoped_ptr<Notification> notification(
       message_center::Notification::CreateSystemNotification(
           kNotificationId,
-          string16() /* no title */,
+          base::string16() /* no title */,
           new_message,
           bundle.GetImageNamed(IDR_AURA_UBER_TRAY_MANAGED_USER),
           system_notifier::kNotifierLocallyManagedUser,
diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc
index d8f524a..81f8f83 100644
--- a/ash/system/chromeos/network/network_connect.cc
+++ b/ash/system/chromeos/network/network_connect.cc
@@ -486,10 +486,10 @@ void CreateConfigurationAndConnect(base::DictionaryValue* properties,
       base::Bind(&OnConfigureFailed));
 }
 
-string16 ErrorString(const std::string& error,
+base::string16 ErrorString(const std::string& error,
                      const std::string& service_path) {
   if (error.empty())
-    return string16();
+    return base::string16();
   if (error == shill::kErrorOutOfRange)
     return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_OUT_OF_RANGE);
   if (error == shill::kErrorPinMissing)
diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc
index ac69a8a..79a5d5b 100644
--- a/ash/system/chromeos/network/network_state_notifier.cc
+++ b/ash/system/chromeos/network/network_state_notifier.cc
@@ -39,7 +39,7 @@ const char kNetworkOutOfCreditsNotificationId[] =
 const int kMinTimeBetweenOutOfCreditsNotifySeconds = 10 * 60;
 
 // Error messages based on |error_name|, not network_state->error().
-string16 GetConnectErrorString(const std::string& error_name) {
+base::string16 GetConnectErrorString(const std::string& error_name) {
   if (error_name == NetworkConnectionHandler::kErrorNotFound)
     return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_CONNECT_FAILED);
   if (error_name == NetworkConnectionHandler::kErrorConfigureFailed)
@@ -48,7 +48,7 @@ string16 GetConnectErrorString(const std::string& error_name) {
   if (error_name == ash::network_connect::kErrorActivateFailed)
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_ACTIVATION_FAILED);
-  return string16();
+  return base::string16();
 }
 
 void ShowErrorNotification(const std::string& notification_id,
@@ -143,7 +143,7 @@ void NetworkStateNotifier::UpdateCellularOutOfCredits(
   base::TimeDelta dtime = base::Time::Now() - out_of_credits_notify_time_;
   if (dtime.InSeconds() > kMinTimeBetweenOutOfCreditsNotifySeconds) {
     out_of_credits_notify_time_ = base::Time::Now();
-    string16 error_msg = l10n_util::GetStringFUTF16(
+    base::string16 error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_OUT_OF_CREDITS_BODY,
         UTF8ToUTF16(cellular->name()));
     ShowErrorNotification(
@@ -234,7 +234,7 @@ void NetworkStateNotifier::ShowConnectErrorNotification(
     const std::string& shill_error,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
-  string16 error = GetConnectErrorString(error_name);
+  base::string16 error = GetConnectErrorString(error_name);
   if (error.empty()) {
     // Service.Error gets cleared shortly after State transitions to Failure,
     // so rely on |shill_error| unless empty.
@@ -257,7 +257,7 @@ void NetworkStateNotifier::ShowConnectErrorNotification(
   shill_properties.GetStringWithoutPathExpansion(
         shill::kErrorDetailsProperty, &network_error_details);
 
-  string16 error_msg;
+  base::string16 error_msg;
   if (!network_error_details.empty()) {
     // network_name should't be empty if network_error_details is set.
     error_msg = l10n_util::GetStringFUTF16(
diff --git a/ash/system/chromeos/tray_display_unittest.cc b/ash/system/chromeos/tray_display_unittest.cc
index 8884da8..921ff7e 100644
--- a/ash/system/chromeos/tray_display_unittest.cc
+++ b/ash/system/chromeos/tray_display_unittest.cc
@@ -200,7 +200,7 @@ TEST_F(TrayDisplayTest, InternalDisplay) {
 
   // Extended
   UpdateDisplay("400x400,200x200");
-  string16 expected = l10n_util::GetStringFUTF16(
+  base::string16 expected = l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetSecondDisplayName());
   tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc
index 37836f0..ef51585d 100644
--- a/ash/system/tray/default_system_tray_delegate.cc
+++ b/ash/system/tray/default_system_tray_delegate.cc
@@ -71,7 +71,7 @@ const std::string DefaultSystemTrayDelegate::GetEnterpriseDomain() const {
 }
 
 const base::string16 DefaultSystemTrayDelegate::GetEnterpriseMessage() const {
-  return string16();
+  return base::string16();
 }
 
 const std::string
@@ -82,12 +82,12 @@ DefaultSystemTrayDelegate::GetLocallyManagedUserManager() const {
 const base::string16
 DefaultSystemTrayDelegate::GetLocallyManagedUserManagerName()
     const {
-  return string16();
+  return base::string16();
 }
 
 const base::string16 DefaultSystemTrayDelegate::GetLocallyManagedUserMessage()
     const {
-  return string16();
+  return base::string16();
 }
 
 bool DefaultSystemTrayDelegate::SystemShouldUpgrade() const {