Clean up suspect changes in base/net (#3375)

b/330364592
b/334975532

cobalt/h5vcc/dial/dial_http_response.cc

@@ -38,11 +38,9 @@ void DialHttpResponse::AddHeader(const std::string& header,
 std::unique_ptr<net::HttpServerResponseInfo>
 DialHttpResponse::ToHttpServerResponseInfo() {
   if (!info_) {
-    info_.reset(new net::HttpServerResponseInfo());
+    info_.reset(
+        new net::HttpServerResponseInfo(net::HttpStatusCode(response_code_)));
   }
-#ifndef COBALT_PENDING_CLEAN_UP
-  info_->status_code() = net::HttpStatusCode(response_code_);
-#endif
   info_->SetBody(body_, mime_type_);
   return std::move(info_);
 }

cobalt/loader/image/animated_image_tracker.cc

@@ -48,8 +48,8 @@ AnimatedImageTracker::AnimatedImageTracker(
   options.priority = animated_image_decode_thread_priority;
   animated_image_decode_thread_.StartWithOptions(options);
 #else
-  animated_image_decode_thread_.StartWithOptions(base::Thread::Options(
-      base::MessagePumpType::DEFAULT, 0 /* default stack size */));
+  animated_image_decode_thread_.StartWithOptions(
+      base::Thread::Options(animated_image_decode_thread_priority));
 #endif
 }
 

cobalt/loader/script_loader_factory.cc

@@ -24,14 +24,6 @@
 namespace cobalt {
 namespace loader {
 
-namespace {
-
-// The ResourceLoader thread uses the default stack size, which is requested
-// by passing in 0 for its stack size.
-const size_t kLoadThreadStackSize = 0;
-
-}  // namespace
-
 ScriptLoaderFactory::ScriptLoaderFactory(
     const char* name, FetcherFactory* fetcher_factory,
     base::ThreadType loader_thread_priority)
@@ -44,8 +36,7 @@ ScriptLoaderFactory::ScriptLoaderFactory(
   options.priority = loader_thread_priority;
   load_thread_.StartWithOptions(options);
 #else
-  load_thread_.StartWithOptions(base::Thread::Options(
-      base::MessagePumpType::DEFAULT, kLoadThreadStackSize));
+  load_thread_.StartWithOptions(base::Thread::Options(loader_thread_priority));
 #endif
 }
 

cobalt/network/net_log_constants.cc

@@ -72,49 +72,37 @@ std::unique_ptr<base::Value::Dict> NetLogConstants::GetConstants() {
   // Add a dictionary with information about the relationship between load flag
   // enums and their symbolic names.
   {
-    std::unique_ptr<base::Value::Dict> dict(new base::Value::Dict());
+    base::Value::Dict dict;
 
-#define LOAD_FLAG(label, value) dict->Set(#label, static_cast<int>(value));
+#define LOAD_FLAG(label, value) dict.Set(#label, static_cast<int>(value));
 #include "net/base/load_flags_list.h"
 #undef LOAD_FLAG
 
-#ifdef REGULAR_UPSTREAM_CODE
     constants_dict->Set("loadFlag", std::move(dict));
-#else
-    constants_dict->Set("loadFlag", base::Value::Dict());
-#endif
   }
 
   // Add a dictionary with information about the relationship between load state
   // enums and their symbolic names.
   {
-    std::unique_ptr<base::Value::Dict> dict(new base::Value::Dict());
+    base::Value::Dict dict;
 
-#define LOAD_STATE(label, value) dict->Set(#label, static_cast<int>(value));
+#define LOAD_STATE(label, value) dict.Set(#label, static_cast<int>(value));
 #include "net/base/load_states_list.h"
 #undef LOAD_STATE
 
-#ifdef REGULAR_UPSTREAM_CODE
     constants_dict->Set("loadState", std::move(dict));
-#else
-    constants_dict->Set("loadState", base::Value::Dict());
-#endif
   }
 
   // Add information on the relationship between net error codes and their
   // symbolic names.
   {
-    std::unique_ptr<base::Value::Dict> dict(new base::Value::Dict());
+    base::Value::Dict dict;
 
-#define NET_ERROR(label, value) dict->Set(#label, static_cast<int>(value));
+#define NET_ERROR(label, value) dict.Set(#label, static_cast<int>(value));
 #include "net/base/net_error_list.h"
 #undef NET_ERROR
 
-#ifdef REGULAR_UPSTREAM_CODE
     constants_dict->Set("netError", std::move(dict));
-#else
-    constants_dict->Set("netError", base::Value::Dict());
-#endif
   }
 
   // Information about the relationship between event phase enums and their

cobalt/network/url_request_context.cc

@@ -204,12 +204,6 @@ URLRequestContext::URLRequestContext(
           net::NetLog::Get(), /*quick_check_enabled=*/true));
 
 #if !defined(QUIC_DISABLED_FOR_STARBOARD)
-#ifndef COBALT_PENDING_CLEAN_UP
-  // TODO: Confirm this is not needed.
-  // ack decimation significantly increases download bandwidth on low-end
-  // android devices.
-  SetQuicFlag(&FLAGS_quic_reloadable_flag_quic_enable_ack_decimation, true);
-#endif
   bool quic_enabled =
       configuration::Configuration::GetInstance()->CobaltEnableQuic();
   if (quic_enabled) {

cobalt/websocket/BUILD.gn

@@ -41,11 +41,7 @@ static_library("websocket") {
 target(gtest_target_type, "websocket_test") {
   testonly = true
   has_pedantic_warnings = true
-  sources = [
-    "mock_websocket_channel.cc",
-    "mock_websocket_channel.h",
-    "web_socket_test.cc",
-  ]
+  sources = [ "web_socket_test.cc" ]
   deps = [
     ":websocket",
     "//cobalt/base",

components/prefs/BUILD.gn

@@ -56,10 +56,7 @@ static_library("prefs") {
 
   configs += [ ":prefs_config" ]
 
-  deps = [
-    "//base",
-    # "//base/util/values:values_util",
-  ]
+  deps = [ "//base" ]
 }
 
 source_set("test_support") {

components/prefs/testing_pref_service.h

@@ -220,7 +220,7 @@ void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
     SetPref(TestingPrefStore* pref_store,
             const std::string& path,
             std::unique_ptr<base::Value> value) {
-  pref_store->SetValue(path, base::Value(),
+  pref_store->SetValue(path, base::Value(std::move(*value)),
                        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 }
 

components/variations/BUILD.gn

@@ -23,8 +23,8 @@ static_library("variations") {
     "client_filterable_state.h",
     "entropy_provider.cc",
     "entropy_provider.h",
-    # "experiment_labels.cc",
-    # "experiment_labels.h",
+    "experiment_labels.cc",
+    "experiment_labels.h",
     "hashing.cc",
     "hashing.h",
     "metrics.cc",
@@ -84,6 +84,10 @@ static_library("variations") {
       "proto/permuted_entropy_cache.proto",
       "proto/study.proto",
       "proto/variations_seed.proto",
+
+      # These can't be by compiled and aren't used in Cobalt.
+      "experiment_labels.cc",
+      "experiment_labels.h",
     ]
   }
 

starboard/linux/shared/platform_configuration/configuration.gni

@@ -38,6 +38,6 @@ platform_tests_path =
     "//starboard/linux/shared:starboard_platform_tests($starboard_toolchain)"
 
 # TODO(b/330364592): re-enable when in-app-dial is fixed.
-enable_in_app_dial = false
+enable_in_app_dial = true
 
 v8_enable_webassembly = true