timezone match code - consider canonical id as well

chromeos/settings/timezone_settings.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 "chromeos/settings/timezone_settings.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/task_runner.h"
 #include "base/threading/worker_pool.h"
+#include "chromeos/settings/timezone_settings_helper.h"
 
 namespace {
 
 // The filepath to the timezone file that symlinks to the actual timezone file.
 const char kTimezoneSymlink[] = "/var/lib/timezone/localtime";
 const char kTimezoneSymlink2[] = "/var/lib/timezone/localtime2";
 
 // The directory that contains all the timezone files. So for timezone
 // "US/Pacific", the actual timezone file is: "/usr/share/zoneinfo/US/Pacific"
 const char kTimezoneFilesDir[] = "/usr/share/zoneinfo/";
@@ skipping 126 matching lines @@
     "Asia/Novokuznetsk",
     "Asia/Ho_Chi_Minh",
     "Asia/Phnom_Penh",
     "Asia/Vientiane",
     "Asia/Shanghai",
     "Asia/Hong_Kong",
     "Asia/Kuala_Lumpur",
     "Asia/Singapore",
     "Asia/Manila",
     "Asia/Taipei",
+    "Asia/Ulaanbaatar",
     "Asia/Makassar",
     "Asia/Irkutsk",
     "Asia/Yakutsk",
     "Australia/Perth",
     "Australia/Eucla",
     "Asia/Seoul",
     "Asia/Tokyo",
     "Asia/Jayapura",
     "Asia/Sakhalin",
     "Asia/Vladivostok",
@@ skipping 89 matching lines @@
   void RemoveObserver(Observer* observer) override;
   const std::vector<icu::TimeZone*>& GetTimezoneList() const override;
 
  protected:
   TimezoneSettingsBaseImpl();
 
   // Returns |timezone| if it is an element of |timezones_|.
   // Otherwise, returns a timezone from |timezones_|, if such exists, that has
   // the same rule as the given |timezone|.
   // Otherwise, returns NULL.
-  // Note multiple timezones with the same time zone offset may exist
+  // Note multiple timezones with the same time zone rules may exist
   // e.g.
   //   US/Pacific == America/Los_Angeles
   const icu::TimeZone* GetKnownTimezoneOrNull(
       const icu::TimeZone& timezone) const;
 
   ObserverList<Observer> observers_;
   std::vector<icu::TimeZone*> timezones_;
   scoped_ptr<icu::TimeZone> timezone_;
 
  private:
@@ skipping 66 matching lines @@
 
 TimezoneSettingsBaseImpl::TimezoneSettingsBaseImpl() {
   for (size_t i = 0; i < arraysize(kTimeZones); ++i) {
     timezones_.push_back(icu::TimeZone::createTimeZone(
         icu::UnicodeString(kTimeZones[i], -1, US_INV)));
   }
 }
 
 const icu::TimeZone* TimezoneSettingsBaseImpl::GetKnownTimezoneOrNull(
     const icu::TimeZone& timezone) const {
-  const icu::TimeZone* known_timezone = NULL;
-  for (std::vector<icu::TimeZone*>::const_iterator iter = timezones_.begin();
-       iter != timezones_.end(); ++iter) {
-    const icu::TimeZone* entry = *iter;
-    if (*entry == timezone)
-      return entry;
-    if (entry->hasSameRules(timezone))
-      known_timezone = entry;
-  }
-
-  // May return NULL if we did not find a matching timezone in our list.
-  return known_timezone;
+  return chromeos::system::GetKnownTimezoneOrNull(timezone, timezones_);
 }
 
 void TimezoneSettingsImpl::SetTimezone(const icu::TimeZone& timezone) {
   // Replace |timezone| by a known timezone with the same rules. If none exists
   // go on with |timezone|.
   const icu::TimeZone* known_timezone = GetKnownTimezoneOrNull(timezone);
   if (!known_timezone)
     known_timezone = &timezone;
 
   timezone_.reset(known_timezone->clone());
@@ skipping 25 matching lines @@
 
   // Store a known timezone equivalent to id in |timezone_|.
   const icu::TimeZone* known_timezone = GetKnownTimezoneOrNull(*timezone_);
   if (known_timezone != NULL && *known_timezone != *timezone_)
     // Not necessary to update the filesystem because |known_timezone| has the
     // same rules.
     timezone_.reset(known_timezone->clone());
 
   icu::TimeZone::setDefault(*timezone_);
   VLOG(1) << "Timezone initially set to " << id;
+  icu::UnicodeString resolvedId;
+  std::string resolvedIdStr;
+  timezone_->getID(resolvedId);
+  VLOG(1) << "Timezone initially resolved to "
+          << resolvedId.toUTF8String(resolvedIdStr);
 }
 
 void TimezoneSettingsStubImpl::SetTimezone(const icu::TimeZone& timezone) {
   // Replace |timezone| by a known timezone with the same rules. If none exists
   // go on with |timezone|.
   const icu::TimeZone* known_timezone = GetKnownTimezoneOrNull(timezone);
   if (!known_timezone)
     known_timezone = &timezone;
 
+  std::string id = base::UTF16ToUTF8(GetTimezoneID(*known_timezone));
+  VLOG(1) << "Setting timezone to " << id;
   timezone_.reset(known_timezone->clone());
   icu::TimeZone::setDefault(*known_timezone);
   FOR_EACH_OBSERVER(Observer, observers_, TimezoneChanged(*known_timezone));
 }
 
 // static
 TimezoneSettingsStubImpl* TimezoneSettingsStubImpl::GetInstance() {
   return Singleton<TimezoneSettingsStubImpl,
       DefaultSingletonTraits<TimezoneSettingsStubImpl> >::get();
 }
@@ skipping 23 matching lines @@
 
 // static
 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
   icu::UnicodeString id;
   timezone.getID(id);
   return base::string16(id.getBuffer(), id.length());
 }
 
 }  // namespace system
 }  // namespace chromeos