[fuchsia] Use fuchsia.intl.PropertyProvider to get time zone

Adds Fuchsia support to InitializeIcuTimeZone() and implements
TimeZoneMonitorFuchsia.

This causes Chrome's internal time zone to match the system.
Note: deprecatedtimezone is still used for exploded time and will be
replaced in a separate CL.

Bug: 985946
Test: JavaScript `Date()` displays the correct local time and zone.
Change-Id: I3ab495ac277f5a53f60a3f51e8b128a12370a99b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877809
Commit-Queue: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721862}

base/BUILD.gn

@@ -1544,6 +1544,8 @@ jumbo_component("base") {
       "fuchsia/filtered_service_directory.h",
       "fuchsia/fuchsia_logging.cc",
       "fuchsia/fuchsia_logging.h",
+      "fuchsia/intl_profile_watcher.cc",
+      "fuchsia/intl_profile_watcher.h",
       "fuchsia/scoped_service_binding.cc",
       "fuchsia/scoped_service_binding.h",
       "fuchsia/service_directory.cc",
@@ -1615,6 +1617,7 @@ jumbo_component("base") {
       "//third_party/fuchsia-sdk/sdk:async-loop-default",
       "//third_party/fuchsia-sdk/sdk:fidl",
       "//third_party/fuchsia-sdk/sdk:fuchsia-deprecatedtimezone",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-intl",
       "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
       "//third_party/fuchsia-sdk/sdk:syslog",
       "//third_party/fuchsia-sdk/sdk:vfs_cpp",
@@ -3039,6 +3042,7 @@ test("base_unittests") {
       "files/file_descriptor_watcher_posix_unittest.cc",
       "fuchsia/file_utils_unittest.cc",
       "fuchsia/filtered_service_directory_unittest.cc",
+      "fuchsia/intl_profile_watcher_unittest.cc",
       "fuchsia/scoped_service_binding_unittest.cc",
       "fuchsia/service_directory_test_base.cc",
       "fuchsia/service_directory_test_base.h",
@@ -3057,6 +3061,7 @@ test("base_unittests") {
       "//third_party/fuchsia-sdk/sdk:async",
       "//third_party/fuchsia-sdk/sdk:async-default",
       "//third_party/fuchsia-sdk/sdk:fdio",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-intl",
       "//third_party/fuchsia-sdk/sdk:fuchsia-logger",
       "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",

base/fuchsia/intl_profile_watcher.cc

+// Copyright 2019 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 "base/fuchsia/intl_profile_watcher.h"
+
+#include <fuchsia/intl/cpp/fidl.h>
+#include <lib/sys/cpp/component_context.h>
+#include <string>
+#include <vector>
+
+#include "base/fuchsia/default_context.h"
+#include "base/fuchsia/fuchsia_logging.h"
+#include "base/strings/string_piece.h"
+
+using ::fuchsia::intl::Profile;
+
+namespace base {
+namespace fuchsia {
+
+IntlProfileWatcher::IntlProfileWatcher(ProfileChangeCallback on_profile_changed)
+    : IntlProfileWatcher(ComponentContextForCurrentProcess()
+                             ->svc()
+                             ->Connect<::fuchsia::intl::PropertyProvider>(),
+                         on_profile_changed) {}
+
+IntlProfileWatcher::IntlProfileWatcher(
+    ::fuchsia::intl::PropertyProviderPtr property_provider,
+    ProfileChangeCallback on_profile_changed)
+    : property_provider_(std::move(property_provider)),
+      on_profile_changed_(std::move(on_profile_changed)) {
+  DCHECK(property_provider_.is_bound());
+  DCHECK(on_profile_changed_);
+
+  property_provider_.set_error_handler([](zx_status_t status) {
+    ZX_LOG(ERROR, status) << "intl.PropertyProvider disconnected. "
+                          << "Profile changes will not be monitored.";
+  });
+
+  property_provider_.events().OnChange = [this]() {
+    property_provider_->GetProfile(
+        [this](Profile profile) { on_profile_changed_.Run(profile); });
+  };
+}
+
+IntlProfileWatcher::~IntlProfileWatcher() = default;
+
+// static
+std::string IntlProfileWatcher::GetPrimaryTimeZoneIdFromProfile(
+    const Profile& profile) {
+  if (!profile.has_time_zones()) {
+    DLOG(WARNING) << "Profile does not contain time zones.";
+    return std::string();
+  }
+
+  const std::vector<::fuchsia::intl::TimeZoneId>& time_zones =
+      profile.time_zones();
+  if (time_zones.size() == 0) {
+    DLOG(WARNING) << "Profile contains an empty time zones list.";
+    return std::string();
+  }
+
+  return time_zones[0].id;
+}
+
+// static
+std::string IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization() {
+  ::fuchsia::intl::PropertyProviderSyncPtr provider;
+  ComponentContextForCurrentProcess()->svc()->Connect(provider.NewRequest());
+  return GetPrimaryTimeZoneIdFromPropertyProvider(std::move(provider));
+}
+
+// static
+std::string IntlProfileWatcher::GetPrimaryTimeZoneIdFromPropertyProvider(
+    ::fuchsia::intl::PropertyProviderSyncPtr property_provider) {
+  DCHECK(property_provider.is_bound());
+  Profile profile;
+  zx_status_t status = property_provider->GetProfile(&profile);
+  if (status != ZX_OK) {
+    ZX_DLOG(ERROR, status) << "Failed to get intl Profile";
+    return std::string();
+  }
+
+  return GetPrimaryTimeZoneIdFromProfile(profile);
+}
+
+}  // namespace fuchsia
+}  // namespace base

base/fuchsia/intl_profile_watcher.h

+// Copyright 2019 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.
+
+#ifndef BASE_FUCHSIA_INTL_PROFILE_WATCHER_H_
+#define BASE_FUCHSIA_INTL_PROFILE_WATCHER_H_
+
+#include <fuchsia/intl/cpp/fidl.h>
+#include <string>
+
+#include "base/base_export.h"
+#include "base/callback.h"
+#include "base/strings/string_piece_forward.h"
+
+namespace base {
+namespace fuchsia {
+
+// Watches fuchsia.intl.PropertyProvider for change notifications and notifies
+// the provided callback. If necessary, the caller is responsible for
+// determining whether an actual change of interest has occurred.
+class BASE_EXPORT IntlProfileWatcher {
+ public:
+  using ProfileChangeCallback =
+      base::RepeatingCallback<void(const ::fuchsia::intl::Profile&)>;
+
+  // |on_profile_changed| will be called each time the profile may have changed.
+  explicit IntlProfileWatcher(ProfileChangeCallback on_profile_changed);
+
+  IntlProfileWatcher(const IntlProfileWatcher&) = delete;
+  IntlProfileWatcher& operator=(const IntlProfileWatcher&) = delete;
+  ~IntlProfileWatcher();
+
+  // Returns the ID of the primary time zone in |profile|.
+  // Returns the empty string if the ID cannot be obtained.
+  static std::string GetPrimaryTimeZoneIdFromProfile(
+      const ::fuchsia::intl::Profile& profile);
+
+  // Returns the ID of the primary time zone for the system.
+  // Returns the empty string if the ID cannot be obtained.
+  // This is a synchronous blocking call to the system service and should only
+  // be used for ICU initialization.
+  static std::string GetPrimaryTimeZoneIdForIcuInitialization();
+
+ private:
+  friend class GetPrimaryTimeZoneIdFromPropertyProviderTest;
+  friend class IntlProfileWatcherTest;
+
+  IntlProfileWatcher(::fuchsia::intl::PropertyProviderPtr property_provider,
+                     ProfileChangeCallback on_profile_changed);
+
+  // Returns the ID of the primary time zone from the profile obtained from
+  // |property_provider|. Returns the empty string if the ID cannot be obtained.
+  static std::string GetPrimaryTimeZoneIdFromPropertyProvider(
+      ::fuchsia::intl::PropertyProviderSyncPtr property_provider);
+
+  ::fuchsia::intl::PropertyProviderPtr property_provider_;
+  const ProfileChangeCallback on_profile_changed_;
+};
+
+}  // namespace fuchsia
+}  // namespace base
+
+#endif  // BASE_FUCHSIA_INTL_PROFILE_WATCHER_H_

base/i18n/icu_util.cc

@@ -34,7 +34,16 @@
 #include "base/mac/foundation_util.h"
 #endif
 
-#if defined(OS_ANDROID) || (defined(OS_LINUX) && !defined(IS_CHROMECAST))
+#if defined(OS_FUCHSIA)
+#include "base/fuchsia/intl_profile_watcher.h"
+#endif
+
+#if defined(OS_ANDROID) || defined(OS_FUCHSIA)
+#include "third_party/icu/source/common/unicode/unistr.h"
+#endif
+
+#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
+    (defined(OS_LINUX) && !defined(IS_CHROMECAST))
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #endif
 
@@ -266,6 +275,19 @@ void InitializeIcuTimeZone() {
   string16 zone_id = android::GetDefaultTimeZoneId();
   icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
       icu::UnicodeString(FALSE, zone_id.data(), zone_id.length())));
+#elif defined(OS_FUCHSIA)
+  // The platform-specific mechanisms used by ICU's detectHostTimeZone() to
+  // determine the default timezone will not work on Fuchsia. Therefore,
+  // proactively set the default system.
+  // This is also required by TimeZoneMonitorFuchsia::ProfileMayHaveChanged(),
+  // which uses the current default to detect whether the time zone changed in
+  // the new profile.
+  // If the system time zone cannot be obtained or is not understood by ICU,
+  // the "unknown" time zone will be returned by createTimeZone() and used.
+  std::string zone_id =
+      fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
+  icu::TimeZone::adoptDefault(
+      icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
 #elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
   // To respond to the timezone change properly, the default timezone
   // cache in ICU has to be populated on starting up.

build/config/fuchsia/tests-with-exec.cmx

@@ -16,6 +16,7 @@
       "fuchsia.device.NameProvider",
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.fonts.Provider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.logger.Log",
       "fuchsia.logger.LogSink",
       "fuchsia.media.Audio",

build/config/fuchsia/tests.cmx

@@ -15,6 +15,7 @@
       "fuchsia.device.NameProvider",
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.fonts.Provider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.logger.Log",
       "fuchsia.logger.LogSink",
       "fuchsia.media.Audio",

chromecast/cast_shell.cmx

@@ -18,6 +18,7 @@
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.device.NameProvider",
       "fuchsia.fonts.Provider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.media.Audio",
       "fuchsia.mediacodec.CodecFactory",
       "fuchsia.net.NameLookup",

fuchsia/engine/test/web_engine_shell.cmx

@@ -9,6 +9,7 @@
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.device.NameProvider",
       "fuchsia.fonts.Provider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.logger.LogSink",
       "fuchsia.media.Audio",
       "fuchsia.media.drm.Widevine",

fuchsia/engine/web_engine_integration_tests.cmx

@@ -10,6 +10,7 @@
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.device.NameProvider",
       "fuchsia.fonts.Provider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.logger.LogSink",
       "fuchsia.media.Audio",
       "fuchsia.net.NameLookup",

fuchsia/http/http.cmx

@@ -7,6 +7,7 @@
     "services": [
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.device.NameProvider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.logger.LogSink",
       "fuchsia.net.NameLookup",
       "fuchsia.netstack.Netstack",

fuchsia/runners/cast/cast_runner.cmx

@@ -6,6 +6,7 @@
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.device.NameProvider",
       "fuchsia.fonts.Provider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.logger.LogSink",
       "fuchsia.media.Audio",
       "fuchsia.media.drm.PlayReady",

fuchsia/runners/web/web_runner.cmx

@@ -8,6 +8,7 @@
       "fuchsia.deprecatedtimezone.Timezone",
       "fuchsia.device.NameProvider",
       "fuchsia.fonts.Provider",
+      "fuchsia.intl.PropertyProvider",
       "fuchsia.logger.LogSink",
       "fuchsia.media.Audio",
       "fuchsia.media.drm.Widevine",

services/device/time_zone_monitor/time_zone_monitor_fuchsia.cc

@@ -6,19 +6,48 @@
 
 #include <memory>
 
+#include "base/bind.h"
+#include "base/fuchsia/fuchsia_logging.h"
+#include "base/fuchsia/intl_profile_watcher.h"
 #include "base/logging.h"
+#include "base/strings/string_piece.h"
+#include "third_party/icu/source/common/unicode/unistr.h"
+#include "third_party/icu/source/i18n/unicode/timezone.h"
 
 namespace device {
 namespace {
 
-// TODO(fuchsia): Implement this. crbug.com/750934
 class TimeZoneMonitorFuchsia : public TimeZoneMonitor {
  public:
-  TimeZoneMonitorFuchsia() = default;
+  TimeZoneMonitorFuchsia()
+      : watcher_(base::BindRepeating(&TimeZoneMonitorFuchsia::OnProfileChanged,
+                                     base::Unretained(this))) {}
+
+  TimeZoneMonitorFuchsia(const TimeZoneMonitorFuchsia&) = delete;
+  TimeZoneMonitorFuchsia& operator=(const TimeZoneMonitorFuchsia&) = delete;
   ~TimeZoneMonitorFuchsia() override = default;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TimeZoneMonitorFuchsia);
+  void OnProfileChanged(const ::fuchsia::intl::Profile& profile) {
+    std::string new_zone_id = watcher_.GetPrimaryTimeZoneIdFromProfile(profile);
+    std::unique_ptr<icu::TimeZone> new_zone(
+        base::WrapUnique(icu::TimeZone::createTimeZone(
+            icu::UnicodeString::fromUTF8(new_zone_id))));
+
+    // Changes to profile properties other than the time zone may have caused
+    // the notification, but we only want to update the ICU default zone and
+    // notify renderers if the time zone changed. The timezone must have
+    // previously been populated. See InitializeICU().
+    std::unique_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
+    if (*current_zone == *new_zone) {
+      DVLOG(1) << "timezone already updated";
+      return;
+    }
+
+    UpdateIcuAndNotifyClients(std::move(new_zone));
+  }
+
+  base::fuchsia::IntlProfileWatcher watcher_;
 };
 
 }  // namespace
@@ -26,8 +55,6 @@ class TimeZoneMonitorFuchsia : public TimeZoneMonitor {
 // static
 std::unique_ptr<TimeZoneMonitor> TimeZoneMonitor::Create(
     scoped_refptr<base::SequencedTaskRunner> file_task_runner) {
-  // TODO(https://crbug.com/750934): Implement a real TimeZoneMonitor.
-
   return std::make_unique<TimeZoneMonitorFuchsia>();
 }
 

services/service_manager/sandbox/BUILD.gn

@@ -112,6 +112,7 @@ component("sandbox") {
     deps += [
       "//third_party/fuchsia-sdk/sdk:fuchsia-deprecatedtimezone",
       "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-intl",
       "//third_party/fuchsia-sdk/sdk:fuchsia-logger",
       "//third_party/fuchsia-sdk/sdk:fuchsia-mediacodec",
       "//third_party/fuchsia-sdk/sdk:fuchsia-net",

services/service_manager/sandbox/fuchsia/sandbox_policy_fuchsia.cc

@@ -10,6 +10,7 @@
 
 #include <fuchsia/deprecatedtimezone/cpp/fidl.h>
 #include <fuchsia/fonts/cpp/fidl.h>
+#include <fuchsia/intl/cpp/fidl.h>
 #include <fuchsia/logger/cpp/fidl.h>
 #include <fuchsia/mediacodec/cpp/fidl.h>
 #include <fuchsia/net/cpp/fidl.h>
@@ -119,6 +120,7 @@ const SandboxConfig& GetConfigForSandboxType(SandboxType type) {
 // Services that are passed to all processes.
 constexpr base::span<const char* const> kDefaultServices = base::make_span(
     (const char* const[]){fuchsia::deprecatedtimezone::Timezone::Name_,
+                          fuchsia::intl::PropertyProvider::Name_,
                           fuchsia::logger::LogSink::Name_});
 
 }  // namespace