Fix expressions 2

.github/workflows/label-cherry-pick.yaml

@@ -75,8 +75,13 @@ jobs:
           set -e
           git fetch origin ${{ matrix.target_branch }}
           git cherry-pick -x $MERGE_COMMIT_SHA
-          git add .
-          git cherry-pick --continue
+          RES=$?
+          set -e
+          if [ $RES -ne 0 ]; then
+            git add .
+            git cherry-pick --continue
+          fi
+          exit $RES
 
       - name: Create Pull Request
         id: create-pr

cobalt/h5vcc/h5vcc_settings.cc

@@ -23,16 +23,6 @@
 namespace cobalt {
 namespace h5vcc {
 
-namespace {
-// Only including needed video combinations for the moment.
-// option 0 disables all video codecs except h264
-// option 1 disables all video codecs except av1
-// option 2 disables all video codecs except vp9
-constexpr std::array<const char*, 3> kDisableCodecCombinations{
-    {"av01;hev1;hvc1;vp09;vp8.vp9", "avc1;avc3;hev1;hvc1;vp09;vp8;vp9",
-     "av01;avc1;avc3;hev1;hvc1;vp8"}};
-};  // namespace
-
 H5vccSettings::H5vccSettings(
     const SetSettingFunc& set_web_setting_func,
     cobalt::media::MediaModule* media_module,
@@ -56,9 +46,9 @@ H5vccSettings::H5vccSettings(
       persistent_settings_(persistent_settings) {
 }
 
-bool H5vccSettings::Set(const std::string& name, int32 value) const {
+bool H5vccSettings::Set(const std::string& name, SetValueType value) const {
   const char kMediaPrefix[] = "Media.";
-  const char kDisableMediaCodec[] = "DisableMediaCodec";
+  const char kMediaCodecBlockList[] = "MediaCodecBlockList";
   const char kNavigatorUAData[] = "NavigatorUAData";
   const char kClientHintHeaders[] = "ClientHintHeaders";
   const char kQUIC[] = "QUIC";
@@ -67,35 +57,37 @@ bool H5vccSettings::Set(const std::string& name, int32 value) const {
   const char kUpdaterMinFreeSpaceBytes[] = "Updater.MinFreeSpaceBytes";
 #endif
 
-  if (name == kDisableMediaCodec &&
-      value < static_cast<int32>(kDisableCodecCombinations.size())) {
-    can_play_type_handler_->SetDisabledMediaCodecs(
-        kDisableCodecCombinations[value]);
+  if (name == kMediaCodecBlockList && value.IsType<std::string>() &&
+      value.AsType<std::string>().size() < 256) {
+    can_play_type_handler_->SetDisabledMediaCodecs(value.AsType<std::string>());
     return true;
   }
 
-  if (set_web_setting_func_ && set_web_setting_func_.Run(name, value)) {
+  if (set_web_setting_func_ && value.IsType<int32>() &&
+      set_web_setting_func_.Run(name, value.AsType<int32>())) {
     return true;
   }
 
-  if (name.rfind(kMediaPrefix, 0) == 0) {
-    return media_module_ ? media_module_->SetConfiguration(
-                               name.substr(strlen(kMediaPrefix)), value)
-                         : false;
+  if (name.rfind(kMediaPrefix, 0) == 0 && value.IsType<int32>()) {
+    return media_module_
+               ? media_module_->SetConfiguration(
+                     name.substr(strlen(kMediaPrefix)), value.AsType<int32>())
+               : false;
   }
 
-  if (name.compare(kNavigatorUAData) == 0 && value == 1) {
+  if (name.compare(kNavigatorUAData) == 0 && value.IsType<int32>() &&
+      value.AsType<int32>() == 1) {
     global_environment_->BindTo("userAgentData", user_agent_data_, "navigator");
     return true;
   }
 
-  if (name.compare(kClientHintHeaders) == 0) {
+  if (name.compare(kClientHintHeaders) == 0 && value.IsType<int32>()) {
     if (!persistent_settings_) {
       return false;
     } else {
       persistent_settings_->SetPersistentSetting(
           network::kClientHintHeadersEnabledPersistentSettingsKey,
-          std::make_unique<base::Value>(value));
+          std::make_unique<base::Value>(value.AsType<int32>()));
       // Tell NetworkModule (if exists) to re-query persistent settings.
       if (network_module_) {
         network_module_
@@ -105,13 +97,13 @@ bool H5vccSettings::Set(const std::string& name, int32 value) const {
     }
   }
 
-  if (name.compare(kQUIC) == 0) {
+  if (name.compare(kQUIC) == 0 && value.IsType<int32>()) {
     if (!persistent_settings_) {
       return false;
     } else {
       persistent_settings_->SetPersistentSetting(
           network::kQuicEnabledPersistentSettingsKey,
-          std::make_unique<base::Value>(value != 0));
+          std::make_unique<base::Value>(value.AsType<int32>() != 0));
       // Tell NetworkModule (if exists) to re-query persistent settings.
       if (network_module_) {
         network_module_->SetEnableQuicFromPersistentSettings();
@@ -121,8 +113,8 @@ bool H5vccSettings::Set(const std::string& name, int32 value) const {
   }
 
 #if SB_IS(EVERGREEN)
-  if (name.compare(kUpdaterMinFreeSpaceBytes) == 0) {
-    updater_module_->SetMinFreeSpaceBytes(value);
+  if (name.compare(kUpdaterMinFreeSpaceBytes) == 0 && value.IsType<int32>()) {
+    updater_module_->SetMinFreeSpaceBytes(value.AsType<int32>());
     return true;
   }
 #endif

cobalt/h5vcc/h5vcc_settings.h

@@ -21,6 +21,7 @@
 #include "cobalt/network/network_module.h"
 #include "cobalt/persistent_storage/persistent_settings.h"
 #include "cobalt/script/global_environment.h"
+#include "cobalt/script/union_type.h"
 #include "cobalt/script/wrappable.h"
 #include "cobalt/web/navigator_ua_data.h"
 
@@ -39,6 +40,8 @@ class H5vccSettings : public script::Wrappable {
   typedef base::Callback<bool(const std::string& name, int value)>
       SetSettingFunc;
 
+  typedef script::UnionType2<int32, std::string> SetValueType;
+
   H5vccSettings(const SetSettingFunc& set_web_setting_func,
                 cobalt::media::MediaModule* media_module,
                 cobalt::media::CanPlayTypeHandler* can_play_type_handler,
@@ -53,7 +56,7 @@ class H5vccSettings : public script::Wrappable {
   // Returns true when the setting is set successfully or if the setting has
   // already been set to the expected value.  Returns false when the setting is
   // invalid or not set to the expected value.
-  bool Set(const std::string& name, int32 value) const;
+  bool Set(const std::string& name, SetValueType value) const;
 
   DEFINE_WRAPPABLE_TYPE(H5vccSettings);
 

cobalt/h5vcc/h5vcc_settings.idl

@@ -13,5 +13,5 @@
 // limitations under the License.
 
 interface H5vccSettings {
-  boolean set(DOMString name, long value);
+  boolean set(DOMString name, (long or DOMString) value);
 };

cobalt/media/base/sbplayer_pipeline.cc

@@ -339,6 +339,8 @@ void SbPlayerPipeline::Stop(const base::Closure& stop_cb) {
   if (demuxer_) {
     stop_cb_ = stop_cb;
     demuxer_->Stop();
+    video_stream_ = nullptr;
+    audio_stream_ = nullptr;
     OnDemuxerStopped();
   } else {
     stop_cb.Run();
@@ -1371,6 +1373,8 @@ void SbPlayerPipeline::ResumeTask(PipelineWindow window,
 
 std::string SbPlayerPipeline::AppendStatisticsString(
     const std::string& message) const {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+
   if (nullptr == video_stream_) {
     return message + ", playback statistics: n/a.";
   } else {

cobalt/watchdog/watchdog.cc

@@ -44,9 +44,9 @@ const int kWatchdogMaxViolations = 200;
 // The minimum number of microseconds between writes.
 const int64_t kWatchdogWriteWaitTime = 300000000;
 // The maximum number of most recent ping infos.
-const int kWatchdogMaxPingInfos = 20;
+const int kWatchdogMaxPingInfos = 60;
 // The maximum length of each ping info.
-const int kWatchdogMaxPingInfoLength = 128;
+const int kWatchdogMaxPingInfoLength = 1024;
 // The maximum number of milliseconds old of an unfetched Watchdog violation.
 const int64_t kWatchdogMaxViolationsAge = 86400000;
 

cobalt/watchdog/watchdog_test.cc

@@ -199,11 +199,7 @@ TEST_F(WatchdogTest, PingOnlyAcceptsValidParameters) {
                                   base::kApplicationStateStarted,
                                   kWatchdogMonitorFrequency));
   ASSERT_TRUE(watchdog_->Ping("test-name", "42"));
-  ASSERT_FALSE(
-      watchdog_->Ping("test-name",
-                      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-                      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-                      "xxxxxxxxxxxxxxxxxxxxxxxxxxx"));
+  ASSERT_FALSE(watchdog_->Ping("test-name", std::string(1025, 'x')));
   ASSERT_TRUE(watchdog_->Unregister("test-name"));
 }
 
@@ -213,11 +209,7 @@ TEST_F(WatchdogTest, PingByClientOnlyAcceptsValidParameters) {
       kWatchdogMonitorFrequency);
   ASSERT_NE(client, nullptr);
   ASSERT_TRUE(watchdog_->PingByClient(client, "42"));
-  ASSERT_FALSE(watchdog_->PingByClient(
-      client,
-      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-      "xxxxxxxxxxxxxxxxxxxxxxxxxxx"));
+  ASSERT_FALSE(watchdog_->PingByClient(client, std::string(1025, 'x')));
   ASSERT_TRUE(watchdog_->UnregisterByClient(client));
 }
 
@@ -358,7 +350,7 @@ TEST_F(WatchdogTest, PingInfosAreEvictedAfterMax) {
   ASSERT_TRUE(watchdog_->Register("test-name", "test_desc",
                                   base::kApplicationStateStarted,
                                   kWatchdogMonitorFrequency));
-  for (int i = 0; i < 21; i++) {
+  for (int i = 0; i < 61; i++) {
     ASSERT_TRUE(watchdog_->Ping("test-name", std::to_string(i)));
   }
   SbThreadSleep(kWatchdogSleepDuration);
@@ -369,7 +361,7 @@ TEST_F(WatchdogTest, PingInfosAreEvictedAfterMax) {
   base::Value* violation_dict = violations_map->FindKey("test-name");
   base::Value* violations = violation_dict->FindKey("violations");
   base::Value* pingInfos = violations->GetList()[0].FindKey("pingInfos");
-  ASSERT_EQ(pingInfos->GetList().size(), 20);
+  ASSERT_EQ(pingInfos->GetList().size(), 60);
   ASSERT_EQ(pingInfos->GetList()[0].FindKey("info")->GetString(), "1");
   ASSERT_TRUE(watchdog_->Unregister("test-name"));
 }

components/version_info/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni")
 import("//build/util/lastchange.gni")
 import("//build/util/process_version.gni")
 if (!use_cobalt_customizations) {
-  import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
 }
 
 declare_args() {
@@ -24,13 +24,11 @@ static_library("version_info") {
     "//base",
   ]
 
-
   public_deps = [
     ":generate_version_info",
     ":channel",
   ]
 
-
   if (is_starboard) {
     sources += [
       "starboard_version_info_values.h"
@@ -49,24 +47,24 @@ static_library("version_info") {
 }
 
 if (!use_cobalt_customizations) {
-  # Isolate the //ui/base dependency in this target.
-  static_library("version_string") {
-    sources = [
-      "version_string.cc",
-      "version_string.h",
-    ]
+# Isolate the //ui/base dependency in this target.
+static_library("version_string") {
+  sources = [
+    "version_string.cc",
+    "version_string.h",
+  ]
 
-    deps = [
-      ":version_info",
-      "//components/strings",
-    ]
+  deps = [
+    ":version_info",
+    "//components/strings",
+  ]
 
-    if (use_unofficial_version_number) {
-      defines = [ "USE_UNOFFICIAL_VERSION_NUMBER" ]
-      deps += [ "//ui/base" ]
-    }
+  if (use_unofficial_version_number) {
+    defines = [ "USE_UNOFFICIAL_VERSION_NUMBER" ]
+    deps += [ "//ui/base" ]
   }
 }
+}
 
 source_set("channel") {
   sources = [
@@ -75,13 +73,13 @@ source_set("channel") {
 }
 
 if (!use_cobalt_customizations) {
-  process_version("generate_version_info") {
-    template_file = "version_info_values.h.version"
-    sources = [
-      "//chrome/VERSION",
-      branding_file_path,
-      lastchange_file,
-    ]
-    output = "$target_gen_dir/version_info_values.h"
-  }
+process_version("generate_version_info") {
+  template_file = "version_info_values.h.version"
+  sources = [
+    "//chrome/VERSION",
+    branding_file_path,
+    lastchange_file,
+  ]
+  output = "$target_gen_dir/version_info_values.h"
+}
 }

components/version_info/METADATA

@@ -9,10 +9,9 @@ third_party {
   }
   url {
     type: GIT
-    value: "https://github.com/chromium/chromium"
+    value: "https://chromium.googlesource.com/chromium/src"
   }
-  # Closest commit hash to m70.
-  version: "737f4cc3d91409d092991dc6834788b9e4c5613a"
+  version: "71.0.3578.127"
   last_upgrade_date {
     year: 2018
     month: 08

extensions/buildflags/METADATA

@@ -9,10 +9,9 @@ third_party {
   }
   url {
     type: GIT
-    value: "https://github.com/chromium/chromium"
+    value: "https://chromium.googlesource.com/chromium/src"
   }
-  # Closest commit hash to m70.
-  version: "835b1103d31bdb8a2df943e3c837099a79e930ad"
+  version: "80.0.3987.162"
   last_upgrade_date {
     year: 2018
     month: 03

starboard/android/arm/cobalt/configuration.py

@@ -39,6 +39,7 @@
         'service_worker_persist_test',
         'deep_links',
         'web_platform_tests',
+        'persistent_cookie',
     ],
 }
 

starboard/android/shared/BUILD.gn

@@ -21,11 +21,14 @@ import("//starboard/shared/starboard/player/player_tests.gni")
 # Configuration to extract GameActivity native files.
 ##########################################################
 
-game_activity_aar_file = "//starboard/android/apk/app/src/main/java/dev/cobalt/libraries/game_activity/games-activity-1.2.2.aar"
+game_activity_aar_file = "//starboard/android/apk/app/src/main/java/dev/cobalt/libraries/game_activity/games-activity-2.0.2.aar"
 
 game_activity_source_files = [
   "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-activity/GameActivity.cpp",
   "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-activity/GameActivity.h",
+  "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-activity/GameActivityEvents.cpp",
+  "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-activity/GameActivityEvents.h",
+  "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-activity/GameActivityLog.h",
   "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-text-input/gamecommon.h",
   "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-text-input/gametextinput.cpp",
   "$target_gen_dir/game_activity/prefab/modules/game-activity/include/game-text-input/gametextinput.h",

starboard/android/shared/media_capabilities_cache.cc

@@ -74,6 +74,7 @@ constexpr int TYPE_USB_HEADSET = 22;
 constexpr int TYPE_WIRED_HEADPHONES = 4;
 constexpr int TYPE_WIRED_HEADSET = 3;
 
+#if SB_API_VERSION >= 15
 SbMediaAudioConnector GetConnectorFromAndroidOutputType(
     int android_output_device_type) {
   switch (android_output_device_type) {
@@ -145,6 +146,7 @@ SbMediaAudioConnector GetConnectorFromAndroidOutputType(
                   << android_output_device_type;
   return kSbMediaAudioConnectorUnknown;
 }
+#endif  // SB_API_VERSION >= 15
 
 bool EndsWith(const std::string& str, const std::string& suffix) {
   if (str.size() < suffix.size()) {
@@ -267,8 +269,12 @@ bool GetAudioConfiguration(int index,
     return env->CallIntMethodOrAbort(j_output_device_info.Get(), name, "()I");
   };
 
+#if SB_API_VERSION >= 15
   configuration->connector =
       GetConnectorFromAndroidOutputType(call_int_method("getType"));
+#else   // SB_API_VERSION >= 15
+  configuration->connector = kSbMediaAudioConnectorHdmi;
+#endif  // SB_API_VERSION >= 15
   configuration->latency = 0;
   configuration->coding_type = kSbMediaAudioCodingTypePcm;
   configuration->number_of_channels = call_int_method("getChannels");