Replace some string16's with base namespace in chrome/browser

TBR=sky

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

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

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index a42f63f..98c5202 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -227,19 +227,19 @@ void HelpHandler::GetLocalizedValues(content::WebUIDataSource* source) {
        l10n_util::GetStringFUTF16(IDS_ABOUT_VERSION_COPYRIGHT,
                                   base::IntToString16(exploded_time.year)));
 
-  string16 license = l10n_util::GetStringFUTF16(
+  base::string16 license = l10n_util::GetStringFUTF16(
       IDS_ABOUT_VERSION_LICENSE,
       ASCIIToUTF16(chrome::kChromiumProjectURL),
       ASCIIToUTF16(chrome::kChromeUICreditsURL));
   source->AddString("productLicense", license);
 
 #if defined(OS_CHROMEOS)
-  string16 os_license = l10n_util::GetStringFUTF16(
+  base::string16 os_license = l10n_util::GetStringFUTF16(
       IDS_ABOUT_CROS_VERSION_LICENSE,
       ASCIIToUTF16(chrome::kChromeUIOSCreditsURL));
   source->AddString("productOsLicense", os_license);
 
-  string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
+  base::string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
   source->AddString(
       "channelChangePageDelayedChangeMessage",
       l10n_util::GetStringFUTF16(
@@ -257,7 +257,7 @@ void HelpHandler::GetLocalizedValues(content::WebUIDataSource* source) {
   }
 #endif
 
-  string16 tos = l10n_util::GetStringFUTF16(
+  base::string16 tos = l10n_util::GetStringFUTF16(
       IDS_ABOUT_TERMS_OF_SERVICE, UTF8ToUTF16(chrome::kChromeUITermsURL));
   source->AddString("productTOS", tos);
 
@@ -332,7 +332,7 @@ void HelpHandler::OnPageLoaded(const ListValue* args) {
       base::FundamentalValue(CanChangeChannel()));
 
   base::Time build_time = base::SysInfo::GetLsbReleaseTime();
-  string16 build_date = base::TimeFormatFriendlyDate(build_time);
+  base::string16 build_date = base::TimeFormatFriendlyDate(build_time);
   web_ui()->CallJavascriptFunction("help.HelpPage.setBuildDate",
                                    base::StringValue(build_date));
 #endif  // defined(OS_CHROMEOS)
@@ -427,7 +427,7 @@ void HelpHandler::RelaunchAndPowerwash(const ListValue* args) {
 #endif  // defined(OS_CHROMEOS)
 
 void HelpHandler::SetUpdateStatus(VersionUpdater::Status status,
-                                  int progress, const string16& message) {
+                                  int progress, const base::string16& message) {
   // Only UPDATING state should have progress set.
   DCHECK(status == VersionUpdater::UPDATING || progress == 0);
 
@@ -467,7 +467,7 @@ void HelpHandler::SetUpdateStatus(VersionUpdater::Status status,
 #if defined(OS_CHROMEOS)
   if (status == VersionUpdater::FAILED_OFFLINE ||
       status == VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED) {
-    string16 types_msg = GetAllowedConnectionTypesMessage();
+    base::string16 types_msg = GetAllowedConnectionTypesMessage();
     if (!types_msg.empty()) {
       web_ui()->CallJavascriptFunction(
           "help.HelpPage.setAndShowAllowedConnectionTypesMsg",