| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc
|
| index 58ab9ab82f953e9f93c125be798c8c9bee232f67..1ef8b1d56afe2791b306c577c9899c68f6fce44a 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc
|
| @@ -203,7 +203,6 @@ class DataReductionProxyConfigServiceClientTest : public testing::Test {
|
| config_client()->GetDelay());
|
| EXPECT_THAT(configurator()->proxies_for_http(),
|
| testing::ContainerEq(expected_http_proxies));
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_EQ(kSuccessSessionKey, request_options()->GetSecureSession());
|
| // The config should be persisted on the pref.
|
| EXPECT_EQ(encoded_config(), persisted_config());
|
| @@ -219,7 +218,6 @@ class DataReductionProxyConfigServiceClientTest : public testing::Test {
|
| config_client()->GetDelay());
|
| EXPECT_THAT(configurator()->proxies_for_http(),
|
| testing::ContainerEq(expected_http_proxies));
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_EQ(kOldSuccessSessionKey, request_options()->GetSecureSession());
|
| }
|
|
|
| @@ -231,7 +229,6 @@ class DataReductionProxyConfigServiceClientTest : public testing::Test {
|
| kPersistedFallback, net::ProxyServer::SCHEME_HTTP));
|
| EXPECT_THAT(configurator()->proxies_for_http(),
|
| testing::ContainerEq(expected_http_proxies));
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_EQ(kPersistedSessionKey, request_options()->GetSecureSession());
|
| }
|
|
|
| @@ -403,7 +400,6 @@ TEST_F(DataReductionProxyConfigServiceClientTest, QuicFieldTrial) {
|
| net::ProxyServer::SCHEME_HTTP),
|
| proxies_for_http[1])
|
| << i;
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty()) << i;
|
|
|
| // Test that the trusted SPDY proxy is updated correctly after each config
|
| // retrieval.
|
| @@ -437,13 +433,11 @@ TEST_F(DataReductionProxyConfigServiceClientTest, EnsureBackoff) {
|
|
|
| SetDataReductionProxyEnabled(true);
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
|
|
| // First attempt should be unsuccessful.
|
| config_client()->RetrieveConfig();
|
| RunUntilIdle();
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_EQ(base::TimeDelta::FromSeconds(20), config_client()->GetDelay());
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -454,7 +448,6 @@ TEST_F(DataReductionProxyConfigServiceClientTest, EnsureBackoff) {
|
| config_client()->RetrieveConfig();
|
| RunUntilIdle();
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_EQ(base::TimeDelta::FromSeconds(40), config_client()->GetDelay());
|
| EXPECT_TRUE(persisted_config().empty());
|
|
|
| @@ -473,7 +466,6 @@ TEST_F(DataReductionProxyConfigServiceClientTest, RemoteConfigSuccess) {
|
| AddMockSuccess();
|
| SetDataReductionProxyEnabled(true);
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| config_client()->RetrieveConfig();
|
| RunUntilIdle();
|
| VerifyRemoteSuccess();
|
| @@ -495,7 +487,6 @@ TEST_F(DataReductionProxyConfigServiceClientTest,
|
|
|
| SetDataReductionProxyEnabled(true);
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
|
|
| // First attempt should be unsuccessful.
|
| config_client()->RetrieveConfig();
|
| @@ -503,7 +494,6 @@ TEST_F(DataReductionProxyConfigServiceClientTest,
|
| EXPECT_EQ(1, config_client()->failed_attempts_before_success());
|
| EXPECT_EQ(base::TimeDelta::FromSeconds(20), config_client()->GetDelay());
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_TRUE(request_options()->GetSecureSession().empty());
|
|
|
| // Second attempt should be successful.
|
| @@ -783,7 +773,6 @@ TEST_F(DataReductionProxyConfigServiceClientTest, ApplySerializedConfig) {
|
|
|
| SetDataReductionProxyEnabled(true);
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| config_client()->ApplySerializedConfig(loaded_config());
|
| VerifySuccessWithLoadedConfig();
|
| EXPECT_TRUE(persisted_config().empty());
|
| @@ -802,7 +791,6 @@ TEST_F(DataReductionProxyConfigServiceClientTest,
|
|
|
| SetDataReductionProxyEnabled(true);
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_TRUE(request_options()->GetSecureSession().empty());
|
|
|
| // Retrieve the remote config.
|
| @@ -822,13 +810,11 @@ TEST_F(DataReductionProxyConfigServiceClientTest, ApplySerializedConfigLocal) {
|
| Init(true);
|
| SetDataReductionProxyEnabled(true);
|
| EXPECT_TRUE(configurator()->proxies_for_http().empty());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_TRUE(request_options()->GetSecureSession().empty());
|
|
|
| // ApplySerializedConfig should apply the encoded config.
|
| config_client()->ApplySerializedConfig(encoded_config());
|
| EXPECT_EQ(2U, configurator()->proxies_for_http().size());
|
| - EXPECT_TRUE(configurator()->proxies_for_https().empty());
|
| EXPECT_TRUE(persisted_config().empty());
|
| EXPECT_FALSE(request_options()->GetSecureSession().empty());
|
| }
|
|
|