Merge branch '24.lts.1+' into cherry-pick-24.lts.1+-3554

cobalt/h5vcc/h5vcc_settings.cc

@@ -51,6 +51,7 @@ bool H5vccSettings::Set(const std::string& name, SetValueType value) const {
   const char kMediaCodecBlockList[] = "MediaCodecBlockList";
   const char kNavigatorUAData[] = "NavigatorUAData";
   const char kQUIC[] = "QUIC";
+  const char kHTTP2[] = "HTTP2";
 
 #if SB_IS(EVERGREEN)
   const char kUpdaterMinFreeSpaceBytes[] = "Updater.MinFreeSpaceBytes";
@@ -62,11 +63,6 @@ bool H5vccSettings::Set(const std::string& name, SetValueType value) const {
     return true;
   }
 
-  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 && value.IsType<int32>()) {
     return media_module_
                ? media_module_->SetConfiguration(
@@ -95,12 +91,32 @@ bool H5vccSettings::Set(const std::string& name, SetValueType value) const {
     }
   }
 
+  if (name.compare(kHTTP2) == 0 && value.IsType<int32>()) {
+    if (!persistent_settings_) {
+      return false;
+    } else {
+      persistent_settings_->SetPersistentSetting(
+          network::kHttp2EnabledPersistentSettingsKey,
+          std::make_unique<base::Value>(value.AsType<int32>() != 0));
+      // Tell NetworkModule (if exists) to re-query persistent settings.
+      if (network_module_) {
+        network_module_->SetEnableHttp2FromPersistentSettings();
+      }
+      return true;
+    }
+  }
+
 #if SB_IS(EVERGREEN)
   if (name.compare(kUpdaterMinFreeSpaceBytes) == 0 && value.IsType<int32>()) {
     updater_module_->SetMinFreeSpaceBytes(value.AsType<int32>());
     return true;
   }
 #endif
+  if (set_web_setting_func_ && value.IsType<int32>() &&
+      set_web_setting_func_.Run(name, value.AsType<int32>())) {
+    return true;
+  }
+
   return false;
 }
 

cobalt/loader/cors_preflight.cc

@@ -244,6 +244,9 @@ bool CORSPreflight::IsPreflightNeeded() {
   if (force_preflight_) {
     return true;
   }
+  if (cors_policy_ == network::kCORSOptional) {
+    return false;
+  }
   // Preflight is not needed if the request method is CORS-safelisted request
   // method and all headers are CORS-safelisted request-header.
   std::vector<std::string> unsafe_headers;

cobalt/network/network_module.cc

@@ -114,6 +114,19 @@ void NetworkModule::SetEnableQuicFromPersistentSettings() {
   }
 }
 
+void NetworkModule::SetEnableHttp2FromPersistentSettings() {
+  // Called on initialization and when the persistent setting is changed.
+  if (options_.persistent_settings != nullptr) {
+    bool enable_http2 =
+        options_.persistent_settings->GetPersistentSettingAsBool(
+            kHttp2EnabledPersistentSettingsKey, false);
+    task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&URLRequestContext::SetEnableHttp2,
+                   base::Unretained(url_request_context_.get()), enable_http2));
+  }
+}
+
 void NetworkModule::EnsureStorageManagerStarted() {
   DCHECK(storage_manager_);
   storage_manager_->EnsureStarted();
@@ -200,6 +213,7 @@ void NetworkModule::Initialize(const std::string& user_agent_string,
       url_request_context_.get(), thread_.get());
 
   SetEnableQuicFromPersistentSettings();
+  SetEnableHttp2FromPersistentSettings();
 }
 
 void NetworkModule::OnCreate(base::WaitableEvent* creation_event) {

cobalt/network/network_module.h

@@ -63,6 +63,7 @@ enum ClientHintHeadersCallType : int32_t {
 constexpr int32_t kEnabledClientHintHeaders = (kCallTypeLoader | kCallTypeXHR);
 
 const char kQuicEnabledPersistentSettingsKey[] = "QUICEnabled";
+const char kHttp2EnabledPersistentSettingsKey[] = "HTTP2Enabled";
 
 class NetworkSystem;
 // NetworkModule wraps various networking-related components such as
@@ -130,6 +131,7 @@ class NetworkModule : public base::MessageLoop::DestructionObserver {
   void SetProxy(const std::string& custom_proxy_rules);
 
   void SetEnableQuicFromPersistentSettings();
+  void SetEnableHttp2FromPersistentSettings();
 
   // Adds the Client Hint Headers to the provided URLFetcher if enabled.
   void AddClientHintHeaders(net::URLFetcher& url_fetcher,

cobalt/network/switches.cc

@@ -44,6 +44,8 @@ const char kDisableInAppDial[] = "disable_in_app_dial";
 // Switch to disable use of the Quic network protocol.
 const char kDisableQuic[] = "disable_quic";
 
+// Switch to disable use of the HTTP/2 (SPDY) network protocol.
+const char kDisableHttp2[] = "disable_h2";
 
 }  // namespace switches
 }  // namespace network

cobalt/network/switches.h

@@ -28,6 +28,7 @@ extern const char kMaxNetworkDelayHelp[];
 extern const char kDisableInAppDial[];
 #endif  // ENABLE_DEBUG_COMMAND_LINE_SWITCHES
 extern const char kDisableQuic[];
+extern const char kDisableHttp2[];
 
 }  // namespace switches
 }  // namespace network

cobalt/network/url_request_context.cc

@@ -180,8 +180,9 @@ URLRequestContext::URLRequestContext(
 
   net::HttpNetworkSession::Params params;
 
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  params.enable_http2 = !command_line->HasSwitch(switches::kDisableHttp2);
   if (configuration::Configuration::GetInstance()->CobaltEnableQuic()) {
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     params.enable_quic = !command_line->HasSwitch(switches::kDisableQuic);
     params.use_quic_for_unknown_origins = params.enable_quic;
   }
@@ -283,7 +284,20 @@ void URLRequestContext::SetProxy(const std::string& proxy_rules) {
 
 void URLRequestContext::SetEnableQuic(bool enable_quic) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  storage_.http_network_session()->SetEnableQuic(enable_quic);
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  bool quic_commandline_enabled =
+      !command_line->HasSwitch(switches::kDisableQuic);
+  storage_.http_network_session()->SetEnableQuic(enable_quic &&
+                                                 quic_commandline_enabled);
+}
+
+void URLRequestContext::SetEnableHttp2(bool enable_http2) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  bool http2_commandline_enabled =
+      !command_line->HasSwitch(switches::kDisableHttp2);
+  storage_.http_network_session()->SetEnableHttp2(enable_http2 &&
+                                                  http2_commandline_enabled);
 }
 
 bool URLRequestContext::using_http_cache() { return using_http_cache_; }

cobalt/network/url_request_context.h

@@ -52,6 +52,7 @@ class URLRequestContext : public net::URLRequestContext {
   void SetProxy(const std::string& custom_proxy_rules);
 
   void SetEnableQuic(bool enable_quic);
+  void SetEnableHttp2(bool enable_http2);
 
   bool using_http_cache();
 

cobalt/version.h

@@ -35,6 +35,6 @@
 //                  release is cut.
 //.
 
-#define COBALT_VERSION "24.lts.41"
+#define COBALT_VERSION "24.lts.50"
 
 #endif  // COBALT_VERSION_H_

net/http/http_network_session.cc

@@ -550,6 +550,21 @@ void HttpNetworkSession::SetEnableQuic(bool enable_quic) {
   params_.enable_quic = enable_quic;
 }
 
+void HttpNetworkSession::SetEnableHttp2(bool enable_http2) {
+  if (params_.enable_http2 == enable_http2) {
+    return;
+  }
+  params_.enable_http2 = enable_http2;
+
+  if (params_.enable_http2) {
+    next_protos_.push_back(kProtoHTTP2);
+  } else {
+    if (next_protos_.back() == kProtoHTTP2) {
+      next_protos_.pop_back();
+    }
+  }
+}
+
 bool HttpNetworkSession::UseQuicForUnknownOrigin() const {
   return params_.use_quic_for_unknown_origins;
 }

net/http/http_network_session.h

@@ -407,6 +407,7 @@ class NET_EXPORT HttpNetworkSession {
   void ToggleQuic();
 
   void SetEnableQuic(bool enable_quic);
+  void SetEnableHttp2(bool enable_http2);
 
   // Whether to try QUIC connection for origins without alt-svc on record.
   bool UseQuicForUnknownOrigin() const;

net/http/http_stream_factory_job.cc

@@ -971,6 +971,7 @@ int HttpStreamFactory::Job::DoInitConnectionImpl() {
       // actually need to preconnect any sockets, so we're done.
       if (job_type_ == PRECONNECT)
         return OK;
+      negotiated_protocol_ = kProtoHTTP2;
       using_spdy_ = true;
       next_state_ = STATE_CREATE_STREAM;
       return OK;

starboard/elf_loader/exported_symbols.cc

@@ -369,7 +369,9 @@ const void* ExportedSymbols::Lookup(const char* name) {
   const void* address = map_[name];
   // Any symbol that is not registered as part of the Starboard API in the
   // constructor of this class is a leak, and is an error.
-  SB_CHECK(address) << "Failed to retrieve the address of '" << name << "'.";
+  if (!address) {
+    SB_LOG(ERROR) << "Failed to retrieve the address of '" << name << "'.";
+  }
   return address;
 }
 

starboard/elf_loader/exported_symbols.h

@@ -29,6 +29,7 @@ namespace elf_loader {
 class ExportedSymbols {
  public:
   ExportedSymbols();
+  // Returns the address of the symbol |name|. If it's not found, returns NULL.
   const void* Lookup(const char* name);
 
  private: