From 2539292bb7c80de9bab5b1737549b6ab05d5267f Mon Sep 17 00:00:00 2001
From: cobalt-github-releaser-bot
 <95661244+cobalt-github-releaser-bot@users.noreply.github.com>
Date: Mon, 6 Nov 2023 10:56:13 -0800
Subject: [PATCH] Cherry pick PR #1905: [XB1] Revert UWP implementation of
 SbTimeZoneGetName (#1911)

Refer to the original PR: https://github.com/youtube/cobalt/pull/1905

Revert to using the Win32 implementation of SbTimeZoneGetName due to a
daylight time offest error.
Filter the IsIANAFormat test for Win32 and XB1

b/304335954

Change-Id: I0aec1011bf8475ea7b6a24f755bb5911b55a6255

Co-authored-by: Tyler Holcombe <tholcombe@google.com>
---
 starboard/shared/win32/test_filters.py | 10 +++++++++-
 starboard/win/win32/test_filters.py    |  4 ----
 starboard/xb1/BUILD.gn                 |  5 ++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/starboard/shared/win32/test_filters.py b/starboard/shared/win32/test_filters.py
index 261946615bba..352adbb1c886 100644
--- a/starboard/shared/win32/test_filters.py
+++ b/starboard/shared/win32/test_filters.py
@@ -15,7 +15,15 @@
 
 from starboard.tools.testing import test_filter
 
-_FILTERED_TESTS = {}
+_FILTERED_TESTS = {
+    'nplb': [
+        # Windows uses a special time zone format that ICU accepts, so we don't
+        # enforce IANA.
+        # TODO(b/304335954): Re-enable the test for UWP after fixing DST
+        # implementation.
+        'SbTimeZoneGetNameTest.IsIANAFormat',
+    ],
+}
 
 
 class TestFilters(object):
diff --git a/starboard/win/win32/test_filters.py b/starboard/win/win32/test_filters.py
index 9ab3ffd84f04..cf8621fb81b0 100644
--- a/starboard/win/win32/test_filters.py
+++ b/starboard/win/win32/test_filters.py
@@ -53,10 +53,6 @@
 
         # Enable once verified on the platform.
         'SbMediaCanPlayMimeAndKeySystem.MinimumSupport',
-
-        # Windows uses a special time zone format that ICU accepts, so we don't enforce IANA.
-        # TODO(b/304335954): Re-enable the test after fixing Windows implementation.
-        'SbTimeZoneGetNameTest.IsIANAFormat',
     ],
     'player_filter_tests': [
         # These tests fail on our VMs for win-win32 builds due to missing
diff --git a/starboard/xb1/BUILD.gn b/starboard/xb1/BUILD.gn
index a0ad82bc0e2c..200f9cfa454b 100644
--- a/starboard/xb1/BUILD.gn
+++ b/starboard/xb1/BUILD.gn
@@ -134,7 +134,6 @@ static_library("starboard_platform") {
     "//starboard/shared/uwp/system_platform_error_internal.cc",
     "//starboard/shared/uwp/system_platform_error_internal.h",
     "//starboard/shared/uwp/system_raise_platform_error.cc",
-    "//starboard/shared/uwp/time_zone_get_name.cc",
     "//starboard/shared/uwp/wasapi_audio.cc",
     "//starboard/shared/uwp/wasapi_audio.h",
     "//starboard/shared/uwp/wasapi_audio_sink.cc",
@@ -177,6 +176,10 @@ static_library("starboard_platform") {
     "//starboard/shared/win32/media_get_max_buffer_capacity.cc",
     "//starboard/shared/win32/media_transform.cc",
     "//starboard/shared/win32/media_transform.h",
+
+    # TODO (b/304335954): Use uwp implementation for correct IANA name once
+    # daylight savings offset is fixed.
+    "//starboard/shared/win32/time_zone_get_name.cc",
     "//starboard/shared/win32/video_decoder.cc",
     "//starboard/shared/win32/video_decoder.h",
     "//starboard/shared/win32/win32_audio_decoder.cc",