Port some files in chrome/common to Linux....

chrome/common/time_format.cc

 // Copyright (c) 2006-2008 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/common/time_format.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 22 matching lines @@
     TimeRemainingFormat() {
       BuildFormats(true, &short_formatter_);
       BuildFormats(false, &long_formatter_);
     }
     ~TimeRemainingFormat() {
       STLDeleteContainerPointers(short_formatter_.begin(),
                                  short_formatter_.end());
       STLDeleteContainerPointers(long_formatter_.begin(),
                                  long_formatter_.end());
     }
-    friend Singleton<TimeRemainingFormat>;
-    friend DefaultSingletonTraits<TimeRemainingFormat>;
+    friend class Singleton<TimeRemainingFormat>;
+    friend struct DefaultSingletonTraits<TimeRemainingFormat>;
 
     std::vector<PluralFormat*> long_formatter_;
     std::vector<PluralFormat*> short_formatter_;
     static void BuildFormats(bool short_version,
                              std::vector<PluralFormat*>* time_formats);
     static PluralFormat* createFallbackFormat(const PluralRules& rules,
                                               int index,
                                               bool short_version);
 
     DISALLOW_EVIL_CONSTRUCTORS(TimeRemainingFormat);
@@ skipping 54 matching lines @@
   scoped_ptr<PluralRules> rules(
       PluralRules::forLocale(Locale::getDefault(), err));
   if (U_FAILURE(err)) {
     err = U_ZERO_ERROR;
     UnicodeString fallback_rules("one: n is 1", -1, US_INV);
     rules.reset(PluralRules::createRules(fallback_rules, err));
     DCHECK(U_SUCCESS(err));
   }
   for (int i = 0; i < 4; ++i) {
     UnicodeString pattern;
-    for (int j = 0; j < arraysize(kKeywords); ++j) {
+    for (size_t j = 0; j < arraysize(kKeywords); ++j) {
       int msg_id = short_version ? kTimeMsgIds[i][j] : kTimeLeftMsgIds[i][j];
       if (msg_id == kInvalidMsgId) continue;
       std::string sub_pattern = WideToUTF8(l10n_util::GetString(msg_id));
       // NA means this keyword is not used in the current locale.
       // Even if a translator translated for this keyword, we do not
       // use it unless it's 'other' (j=0) or it's defined in the rules
       // for the current locale. Special-casing of 'other' will be removed
       // once ICU's isKeyword is fixed to return true for isKeyword('other').
       if (sub_pattern.compare("NA") != 0 &&
           (j == 0 || rules->isKeyword(kKeywords[j]))) {
@@ skipping 76 matching lines @@
   // Anything bigger gets "X days left"
   } 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;
-  std::wstring formatted;
-  time_string.extract(static_cast<UChar*>(WriteInto(&formatted, capacity)),
+  string16 result_utf16;
+  time_string.extract(static_cast<UChar*>(
+                      WriteInto(&result_utf16, capacity)),
                       capacity, error);
   DCHECK(U_SUCCESS(error));
-  return formatted;
+  return UTF16ToWide(result_utf16);
 }
 
 // static
 std::wstring TimeFormat::TimeRemaining(const TimeDelta& delta) {
   return TimeRemainingImpl(delta, false);
 }
 
 // static
 std::wstring TimeFormat::TimeRemainingShort(const TimeDelta& delta) {
   return TimeRemainingImpl(delta, true);
 }
 
 // static
 std::wstring TimeFormat::RelativeDate(
     const Time& time,
     const Time* optional_midnight_today) {
   Time midnight_today = optional_midnight_today ? *optional_midnight_today :
       Time::Now().LocalMidnight();
 
   // Filter out "today" and "yesterday"
   if (time >= midnight_today)
     return l10n_util::GetString(IDS_PAST_TIME_TODAY);
   else if (time >= midnight_today -
                    TimeDelta::FromMicroseconds(Time::kMicrosecondsPerDay))
     return l10n_util::GetString(IDS_PAST_TIME_YESTERDAY);
 
   return std::wstring();
 }