Change default params for ECT 3G

Experiment results: https://docs.google.com/document/d/18lCPpkgPGEPvsZtbGzowvRjZSKevEYfknCr_G9hdFLA/edit?usp=sharing
Set the max delayable requests to 8 and the multiplier
to 3.0.

Change-Id: I2ae974becd8a27b168e30ecd1e24809c19ba5500
Bug: 746640
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1578359Reviewed-by: Doug Arnett <dougarnett@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653417}

services/network/resource_scheduler_params_manager.cc

@@ -63,12 +63,11 @@ GetParamsForNetworkQualityContainer() {
       ResourceSchedulerParamsManager::ParamsForNetworkQuality(
           8, 3.0, true /* delay_requests_on_multiplexed_connections */,
           base::nullopt)));
-  result.emplace(
-      std::make_pair(net::EFFECTIVE_CONNECTION_TYPE_3G,
-                     ResourceSchedulerParamsManager::ParamsForNetworkQuality(
-                         kDefaultMaxNumDelayableRequestsPerClient, 0.0,
-                         true /* delay_requests_on_multiplexed_connections */,
-                         base::nullopt)));
+  result.emplace(std::make_pair(
+      net::EFFECTIVE_CONNECTION_TYPE_3G,
+      ResourceSchedulerParamsManager::ParamsForNetworkQuality(
+          8, 3.0, true /* delay_requests_on_multiplexed_connections */,
+          base::nullopt)));
 
   for (int config_param_index = 1; config_param_index <= 20;
        ++config_param_index) {

services/network/resource_scheduler_params_manager_unittest.cc

@@ -116,11 +116,11 @@ class ResourceSchedulerParamsManagerTest : public testing::Test {
         return;
 
       case net::EFFECTIVE_CONNECTION_TYPE_3G:
-        EXPECT_EQ(10u, resource_scheduler_params_manager
-                           .GetParamsForEffectiveConnectionType(
-                               effective_connection_type)
-                           .max_delayable_requests);
-        EXPECT_EQ(0.0, resource_scheduler_params_manager
+        EXPECT_EQ(8u, resource_scheduler_params_manager
+                          .GetParamsForEffectiveConnectionType(
+                              effective_connection_type)
+                          .max_delayable_requests);
+        EXPECT_EQ(3.0, resource_scheduler_params_manager
                            .GetParamsForEffectiveConnectionType(
                                effective_connection_type)
                            .non_delayable_weight);
@@ -190,7 +190,8 @@ TEST_F(ResourceSchedulerParamsManagerTest,
     net::EffectiveConnectionType ect =
         static_cast<net::EffectiveConnectionType>(effective_connection_type);
     if (effective_connection_type == net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G ||
-        effective_connection_type == net::EFFECTIVE_CONNECTION_TYPE_2G) {
+        effective_connection_type == net::EFFECTIVE_CONNECTION_TYPE_2G ||
+        effective_connection_type == net::EFFECTIVE_CONNECTION_TYPE_3G) {
       EXPECT_EQ(8u, resource_scheduler_params_manager
                         .GetParamsForEffectiveConnectionType(ect)
                         .max_delayable_requests);
@@ -204,20 +205,6 @@ TEST_F(ResourceSchedulerParamsManagerTest,
                       .GetParamsForEffectiveConnectionType(ect)
                       .max_queuing_time.has_value());
 
-    } else if (effective_connection_type == net::EFFECTIVE_CONNECTION_TYPE_3G) {
-      EXPECT_EQ(10u, resource_scheduler_params_manager
-                         .GetParamsForEffectiveConnectionType(ect)
-                         .max_delayable_requests);
-      EXPECT_EQ(0.0, resource_scheduler_params_manager
-                         .GetParamsForEffectiveConnectionType(ect)
-                         .non_delayable_weight);
-      EXPECT_TRUE(resource_scheduler_params_manager
-                      .GetParamsForEffectiveConnectionType(ect)
-                      .delay_requests_on_multiplexed_connections);
-      EXPECT_TRUE(resource_scheduler_params_manager
-                      .GetParamsForEffectiveConnectionType(ect)
-                      .max_queuing_time.has_value());
-
     } else {
       VerifyDefaultParams(
           resource_scheduler_params_manager,
@@ -262,10 +249,10 @@ TEST_F(ResourceSchedulerParamsManagerTest, MaxQueuingTime) {
                     .max_queuing_time);
 
     } else if (effective_connection_type == net::EFFECTIVE_CONNECTION_TYPE_3G) {
-      EXPECT_EQ(10u, resource_scheduler_params_manager
-                         .GetParamsForEffectiveConnectionType(ect)
-                         .max_delayable_requests);
-      EXPECT_EQ(0.0, resource_scheduler_params_manager
+      EXPECT_EQ(8u, resource_scheduler_params_manager
+                        .GetParamsForEffectiveConnectionType(ect)
+                        .max_delayable_requests);
+      EXPECT_EQ(3.0, resource_scheduler_params_manager
                          .GetParamsForEffectiveConnectionType(ect)
                          .non_delayable_weight);
       EXPECT_TRUE(resource_scheduler_params_manager