Replace string16 with base::string16.

chrome/browser/chromeos/system/timezone_util.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/system/timezone_util.h"
 
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ skipping 46 matching lines @@
   zone_id.toUTF8String(zone_id_str);
 
   // Resource keys for timezones use ':' in place of '/'.
   ReplaceSubstringsAfterOffset(&zone_id_str, 0, "/", ":");
   scoped_ptr_malloc<UResourceBundle, UResClose> zone_item(
       ures_getByKey(zone_strings, zone_id_str.c_str(), NULL, &status));
   icu::UnicodeString city;
   if (!U_FAILURE(status)) {
     city = icu::ures_getUnicodeStringByKey(zone_item.get(), "ec", &status);
     if (U_SUCCESS(status))
-      return string16(city.getBuffer(), city.length());
+      return base::string16(city.getBuffer(), city.length());
   }
 
   // Fallback case in case of failure.
   ReplaceSubstringsAfterOffset(&zone_id_str, 0, ":", "/");
   // Take the last component of a timezone id (e.g. 'Baz' in 'Foo/Bar/Baz').
   // Depending on timezones, keeping all but the 1st component
   // (e.g. Bar/Baz) may be better, but our current list does not have
   // any timezone for which that's the case.
   std::string::size_type slash_pos = zone_id_str.rfind('/');
   if (slash_pos != std::string::npos && slash_pos < zone_id_str.size())
@@ skipping 27 matching lines @@
   // have to come up with better 'display' names. One possibility is to list
   // multiple cities (e.g. "Los Angeles, Vancouver .." in the order of
   // the population of a country the city belongs to.).
   // We can also think of using LONG_GENERIC or LOCATION once we upgrade
   // to ICU 4.6.
   // In the meantime, we use "LONG" name with "Exemplar City" to distinguish
   // multiple timezones with the same "LONG" name but with different
   // rules (e.g. US Mountain Time in Denver vs Phoenix).
   icu::UnicodeString name;
   timezone.getDisplayName(dst_offset != 0, icu::TimeZone::LONG, name);
-  string16 result(l10n_util::GetStringFUTF16(
+  base::string16 result(l10n_util::GetStringFUTF16(
       IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, ASCIIToUTF16(offset_str),
-      string16(name.getBuffer(), name.length()), GetExemplarCity(timezone)));
+      base::string16(name.getBuffer(), name.length()), GetExemplarCity(timezone)));
   base::i18n::AdjustStringForLocaleDirection(&result);
   return result;
 }
 
 }  // namespace
 
 namespace chromeos {
 namespace system {
 
 // Creates a list of pairs of each timezone's ID and name.
 scoped_ptr<base::ListValue> GetTimezoneList() {
   const std::vector<icu::TimeZone*> &timezones =
       chromeos::system::TimezoneSettings::GetInstance()->GetTimezoneList();
   scoped_ptr<base::ListValue> timezoneList(new base::ListValue());
   for (std::vector<icu::TimeZone*>::const_iterator iter = timezones.begin();
        iter != timezones.end(); ++iter) {
     const icu::TimeZone* timezone = *iter;
     base::ListValue* option = new base::ListValue();
     option->Append(new base::StringValue(
         chromeos::system::TimezoneSettings::GetTimezoneID(*timezone)));
     option->Append(new base::StringValue(GetTimezoneName(*timezone)));
     timezoneList->Append(option);
   }
   return timezoneList.Pass();
 }
 
 }  // namespace system
 }  // namespace chromeos