Move more uses of string16 to specify base::

ui/base/l10n/time_format.cc

 // Copyright (c) 2011 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 "ui/base/l10n/time_format.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 263 matching lines @@
   if (rules.isKeyword(UNICODE_STRING_SIMPLE("one"))) {
     pattern += UNICODE_STRING_SIMPLE("one{# ") + kUnits[index][0] + suffix;
   }
   pattern += UNICODE_STRING_SIMPLE(" other{# ") + kUnits[index][1] + suffix;
   UErrorCode err = U_ZERO_ERROR;
   icu::PluralFormat* format = new icu::PluralFormat(rules, pattern, err);
   DCHECK(U_SUCCESS(err));
   return format;
 }
 
-string16 FormatTimeImpl(const TimeDelta& delta, FormatType format_type) {
+base::string16 FormatTimeImpl(const TimeDelta& delta, FormatType format_type) {
   if (delta.ToInternalValue() < 0) {
     NOTREACHED() << "Negative duration";
-    return string16();
+    return base::string16();
   }
 
   int number;
 
   const std::vector<icu::PluralFormat*>& formatters =
     g_time_formatter.Get().formatter(format_type);
 
   UErrorCode error = U_ZERO_ERROR;
   icu::UnicodeString time_string;
   // Less than a minute gets "X seconds left"
@@ skipping 18 matching lines @@
   } else {
     number = static_cast<int>(delta.ToInternalValue() /
                               Time::kMicrosecondsPerDay);
     time_string = formatters[3]->format(number, error);
   }
 
   // With the fallback added, this should never fail.
   DCHECK(U_SUCCESS(error));
   int capacity = time_string.length() + 1;
   DCHECK_GT(capacity, 1);
-  string16 result;
+  base::string16 result;
   time_string.extract(static_cast<UChar*>(WriteInto(&result, capacity)),
                       capacity, error);
   DCHECK(U_SUCCESS(error));
   return result;
 }
 
 }  // namespace
 
 namespace ui {
 
 // static
-string16 TimeFormat::TimeElapsed(const TimeDelta& delta) {
+base::string16 TimeFormat::TimeElapsed(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_ELAPSED);
 }
 
 // static
-string16 TimeFormat::TimeRemaining(const TimeDelta& delta) {
+base::string16 TimeFormat::TimeRemaining(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_REMAINING);
 }
 
 // static
-string16 TimeFormat::TimeRemainingLong(const TimeDelta& delta) {
+base::string16 TimeFormat::TimeRemainingLong(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_REMAINING_LONG);
 }
 
 // static
-string16 TimeFormat::TimeRemainingShort(const TimeDelta& delta) {
+base::string16 TimeFormat::TimeRemainingShort(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_SHORT);
 }
 
 // static
-string16 TimeFormat::TimeDurationLong(const TimeDelta& delta) {
+base::string16 TimeFormat::TimeDurationLong(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_DURATION_LONG);
 }
 
 // static
-string16 TimeFormat::RelativeDate(
+base::string16 TimeFormat::RelativeDate(
     const Time& time,
     const Time* optional_midnight_today) {
   Time midnight_today = optional_midnight_today ? *optional_midnight_today :
       Time::Now().LocalMidnight();
   TimeDelta day = TimeDelta::FromMicroseconds(Time::kMicrosecondsPerDay);
   Time tomorrow = midnight_today + day;
   Time yesterday = midnight_today - day;
   if (time >= tomorrow)
-    return string16();
+    return base::string16();
   else if (time >= midnight_today)
     return l10n_util::GetStringUTF16(IDS_PAST_TIME_TODAY);
   else if (time >= yesterday)
     return l10n_util::GetStringUTF16(IDS_PAST_TIME_YESTERDAY);
-  return string16();
+  return base::string16();
 }
 
 }  // namespace ui