Remove DataCompressionProxyDevRollout experiment
DataCompressionProxyDevRollout experiment is no longer used, so it
should be removed.
BUG=585198
Review URL: https://codereview.chromium.org/1732213002
Cr-Commit-Position: refs/heads/master@{#385500}
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1822034..ab15b94 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6072,14 +6072,6 @@
</message>
<!-- Data Reduction Proxy -->
- <if expr="is_android">
- <message name="IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_NAME" desc="An about::flags experiment title to enable/disable the development version of the data reduction proxy" translateable="false">
- Experiment Data Reduction Proxy
- </message>
- <message name="IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_DESCRIPTION" desc="Describes an about:flags experiment to enable/disable the development version of the data reduction proxy" translateable="false">
- Enable or disable using the development version of the data reduction proxy.
- </message>
- </if>
<message name="IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME" desc="An about::flags experiment title to enable/disable Data Saver Lo-Fi" translateable="false">
Data Saver Lo-Fi mode
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index da3131b..4844d3f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1328,11 +1328,6 @@
SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)},
#endif
#if defined(OS_ANDROID)
- {"enable-data-reduction-proxy-dev", IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_NAME,
- IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, kOsAndroid,
- ENABLE_DISABLE_VALUE_TYPE(
- data_reduction_proxy::switches::kEnableDataReductionProxyDev,
- data_reduction_proxy::switches::kDisableDataReductionProxyDev)},
{"enable-data-reduction-proxy-carrier-test",
IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME,
IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_DESCRIPTION, kOsAndroid,
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc
index 2fda7a2..1c222b0 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc
@@ -472,16 +472,6 @@
std::vector<net::ProxyServer> proxies =
GetProxiesForHTTP(config.proxy_config());
- if (params_ && params::IsDevRolloutEnabled()) {
- // If dev rollout is enabled, proxies returned by client config API are
- // discarded.
- proxies.clear();
- proxies.push_back(net::ProxyServer::FromURI(params_->GetDefaultDevOrigin(),
- net::ProxyServer::SCHEME_HTTP));
- proxies.push_back(net::ProxyServer::FromURI(
- params_->GetDefaultDevFallbackOrigin(), net::ProxyServer::SCHEME_HTTP));
- }
-
if (proxies.empty())
return false;
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 c77e837a..c58f726 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
@@ -344,38 +344,25 @@
DISALLOW_COPY_AND_ASSIGN(DataReductionProxyConfigServiceClientTest);
};
-// Tests the interaction of client config with dev rollout and QUIC field trial.
-TEST_F(DataReductionProxyConfigServiceClientTest, DevRolloutAndQuic) {
+// Tests the interaction of client config with QUIC field trial.
+TEST_F(DataReductionProxyConfigServiceClientTest, QuicFieldTrial) {
Init(true);
const struct {
- bool enable_dev;
bool enable_quic;
bool enable_trusted_spdy_proxy_field_trial;
std::string expected_primary_proxy;
std::string expected_fallback_proxy;
net::ProxyServer::Scheme expected_primary_proxy_scheme;
} tests[] = {
- {false, false, false, kSuccessOrigin, kSuccessFallback,
+ {false, false, kSuccessOrigin, kSuccessFallback,
net::ProxyServer::SCHEME_HTTPS},
- {false, false, true, kSuccessOrigin, kSuccessFallback,
+ {false, true, kSuccessOrigin, kSuccessFallback,
net::ProxyServer::SCHEME_HTTPS},
- {false, true, true, kSuccessOrigin, kSuccessFallback,
- net::ProxyServer::SCHEME_QUIC},
- {true, false, true, TestDataReductionProxyParams::DefaultDevOrigin(),
- TestDataReductionProxyParams::DefaultDevFallbackOrigin(),
- net::ProxyServer::SCHEME_HTTPS},
- {true, true, true, TestDataReductionProxyParams::DefaultDevOrigin(),
- TestDataReductionProxyParams::DefaultDevFallbackOrigin(),
+ {true, true, kSuccessOrigin, kSuccessFallback,
net::ProxyServer::SCHEME_QUIC},
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- if (tests[i].enable_dev) {
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- command_line->AppendSwitch(
- data_reduction_proxy::switches::kEnableDataReductionProxyDev);
- }
-
base::FieldTrialList field_trial_list(new base::MockEntropyProvider());
base::FieldTrialList::CreateFieldTrial(
params::GetTrustedSpdyProxyFieldTrialName(),
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
index fee0df86..5e86c1ec 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc
@@ -69,9 +69,7 @@
void TestDataReductionProxyConfig::ResetParamFlagsForTest(int flags) {
config_values_ = make_scoped_ptr(new TestDataReductionProxyParams(
flags, TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_SSL_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN));
+ ~TestDataReductionProxyParams::HAS_SSL_ORIGIN));
}
TestDataReductionProxyParams* TestDataReductionProxyConfig::test_params() {
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
index 3c5fb84..3146f03 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
@@ -62,9 +62,7 @@
DataReductionProxyParams::kFallbackAllowed |
DataReductionProxyParams::kPromoAllowed,
TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_SSL_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN));
+ ~TestDataReductionProxyParams::HAS_SSL_ORIGIN));
}
void ResetSettings(bool allowed,
@@ -469,10 +467,7 @@
flags |= DataReductionProxyParams::kAllowed;
if (tests[i].fallback_allowed)
flags |= DataReductionProxyParams::kFallbackAllowed;
- unsigned int has_definitions =
- TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN;
+ unsigned int has_definitions = TestDataReductionProxyParams::HAS_EVERYTHING;
scoped_ptr<TestDataReductionProxyParams> params(
new TestDataReductionProxyParams(flags, has_definitions));
scoped_ptr<DataReductionProxyConfig> config =
@@ -518,10 +513,7 @@
int flags = 0;
flags |= DataReductionProxyParams::kAllowed;
flags |= DataReductionProxyParams::kFallbackAllowed;
- unsigned int has_definitions =
- TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN;
+ unsigned int has_definitions = TestDataReductionProxyParams::HAS_EVERYTHING;
scoped_ptr<TestDataReductionProxyParams> params(
new TestDataReductionProxyParams(flags, has_definitions));
scoped_ptr<DataReductionProxyConfig> config = BuildConfig(std::move(params));
@@ -565,7 +557,6 @@
const struct {
net::HostPortPair host_port_pair;
bool fallback_allowed;
- bool set_dev_origin;
bool expected_result;
net::HostPortPair expected_first;
net::HostPortPair expected_second;
@@ -576,7 +567,6 @@
net::ProxyServer::SCHEME_HTTP)
.host_port_pair(),
true,
- false,
true,
net::ProxyServer::FromURI(TestDataReductionProxyParams::DefaultOrigin(),
net::ProxyServer::SCHEME_HTTP)
@@ -590,7 +580,6 @@
net::ProxyServer::SCHEME_HTTP)
.host_port_pair(),
false,
- false,
true,
net::ProxyServer::FromURI(TestDataReductionProxyParams::DefaultOrigin(),
net::ProxyServer::SCHEME_HTTP)
@@ -602,7 +591,6 @@
TestDataReductionProxyParams::DefaultFallbackOrigin(),
net::ProxyServer::SCHEME_HTTP).host_port_pair(),
true,
- false,
true,
net::ProxyServer::FromURI(
TestDataReductionProxyParams::DefaultFallbackOrigin(),
@@ -615,7 +603,6 @@
net::ProxyServer::SCHEME_HTTP).host_port_pair(),
false,
false,
- false,
net::HostPortPair::FromURL(GURL()),
net::HostPortPair::FromURL(GURL()),
false,
@@ -624,7 +611,6 @@
TestDataReductionProxyParams::DefaultSSLOrigin(),
net::ProxyServer::SCHEME_HTTP).host_port_pair(),
true,
- false,
true,
net::ProxyServer::FromURI(
TestDataReductionProxyParams::DefaultSSLOrigin(),
@@ -632,40 +618,12 @@
net::HostPortPair::FromURL(GURL()),
false,
true},
- {net::ProxyServer::FromURI(
- TestDataReductionProxyParams::DefaultDevOrigin(),
- net::ProxyServer::SCHEME_HTTP).host_port_pair(),
- true,
- true,
- true,
- net::ProxyServer::FromURI(
- TestDataReductionProxyParams::DefaultDevOrigin(),
- net::ProxyServer::SCHEME_HTTP).host_port_pair(),
- net::ProxyServer::FromURI(
- TestDataReductionProxyParams::DefaultDevFallbackOrigin(),
- net::ProxyServer::SCHEME_HTTP).host_port_pair(),
- false,
- false},
- {net::ProxyServer::FromURI(TestDataReductionProxyParams::DefaultOrigin(),
- net::ProxyServer::SCHEME_HTTP)
- .host_port_pair(),
- true,
- true,
- false,
- net::HostPortPair::FromURL(GURL()),
- net::HostPortPair::FromURL(GURL()),
- false,
- false},
};
for (size_t i = 0; i < arraysize(tests); ++i) {
int flags = DataReductionProxyParams::kAllowed;
if (tests[i].fallback_allowed)
flags |= DataReductionProxyParams::kFallbackAllowed;
unsigned int has_definitions = TestDataReductionProxyParams::HAS_EVERYTHING;
- if (!tests[i].set_dev_origin) {
- has_definitions &= ~TestDataReductionProxyParams::HAS_DEV_ORIGIN;
- has_definitions &= ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN;
- }
scoped_ptr<TestDataReductionProxyParams> params(
new TestDataReductionProxyParams(flags, has_definitions));
DataReductionProxyTypeInfo proxy_type_info;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
index 310ffc9..8268474f 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
@@ -136,11 +136,8 @@
test_context_ =
DataReductionProxyTestContext::Builder()
.WithParamsFlags(
- DataReductionProxyParams::kAllowAllProxyConfigurations)
- .WithParamsDefinitions(
- TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN)
+ DataReductionProxyParams::kAllowAllProxyConfigurations)
+ .WithParamsDefinitions(TestDataReductionProxyParams::HAS_EVERYTHING)
.Build();
}
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc
index 8af0b73..fa03b6b2 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc
@@ -274,11 +274,8 @@
: params_flags_(DataReductionProxyParams::kAllowed |
DataReductionProxyParams::kFallbackAllowed |
DataReductionProxyParams::kPromoAllowed),
- params_definitions_(
- TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_SSL_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN),
+ params_definitions_(TestDataReductionProxyParams::HAS_EVERYTHING &
+ ~TestDataReductionProxyParams::HAS_SSL_ORIGIN),
client_(Client::UNKNOWN),
request_context_(nullptr),
mock_socket_factory_(nullptr),
@@ -288,8 +285,7 @@
use_mock_request_options_(false),
use_config_client_(false),
use_test_config_client_(false),
- skip_settings_initialization_(false) {
-}
+ skip_settings_initialization_(false) {}
DataReductionProxyTestContext::Builder&
DataReductionProxyTestContext::Builder::WithParamsFlags(int params_flags) {
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
index 4e94d36b..d4eedb0f 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
@@ -34,8 +34,6 @@
// available.
const char kCarrierTestOrigin[] =
"http://o-o.preferred.nttdocomodcp-hnd1.proxy-dev.googlezip.net:80";
-const char kDevOrigin[] = "https://proxy-dev.googlezip.net:443";
-const char kDevFallbackOrigin[] = "proxy-dev.googlezip.net:80";
const char kDefaultFallbackOrigin[] = "compress.googlezip.net:80";
const char kDefaultSecureProxyCheckUrl[] = "http://check.googlezip.net/connect";
const char kDefaultWarmupUrl[] = "http://www.gstatic.com/generate_204";
@@ -43,7 +41,6 @@
const char kAndroidOneIdentifier[] = "sprout";
const char kQuicFieldTrial[] = "DataReductionProxyUseQuic";
-const char kDevRolloutFieldTrial[] = "DataCompressionProxyDevRollout";
const char kLoFiFieldTrial[] = "DataCompressionProxyLoFi";
const char kLoFiFlagFieldTrial[] = "DataCompressionProxyLoFiFlag";
@@ -174,16 +171,6 @@
return kQuicFieldTrial;
}
-bool IsDevRolloutEnabled() {
- const base::CommandLine& command_line =
- *base::CommandLine::ForCurrentProcess();
- if (command_line.HasSwitch(switches::kDisableDataReductionProxyDev))
- return false;
-
- return command_line.HasSwitch(switches::kEnableDataReductionProxyDev) ||
- (FieldTrialList::FindFullName(kDevRolloutFieldTrial) == kEnabled);
-}
-
bool IsConfigClientEnabled() {
// Config client is enabled by default. It can be disabled only if Chromium
// belongs to a field trial group whose name starts with "Disabled".
@@ -306,8 +293,7 @@
void DataReductionProxyParams::EnableQuic(bool enable) {
quic_enabled_ = enable;
DCHECK(!quic_enabled_ || params::IsIncludedInQuicFieldTrial());
- if (!params::IsDevRolloutEnabled() && override_quic_origin_.empty() &&
- quic_enabled_) {
+ if (override_quic_origin_.empty() && quic_enabled_) {
origin_ = net::ProxyServer::FromURI(kDefaultQuicOrigin,
net::ProxyServer::SCHEME_HTTP);
proxies_for_http_.clear();
@@ -393,12 +379,7 @@
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
std::string origin;
- if (!command_line.HasSwitch(switches::kDisableDataReductionProxyDev)) {
- origin = command_line.GetSwitchValueASCII(
- switches::kDataReductionProxyDev);
- }
- if (origin.empty())
- origin = command_line.GetSwitchValueASCII(switches::kDataReductionProxy);
+ origin = command_line.GetSwitchValueASCII(switches::kDataReductionProxy);
std::string fallback_origin =
command_line.GetSwitchValueASCII(switches::kDataReductionProxyFallback);
std::string ssl_origin =
@@ -419,14 +400,10 @@
// Set from preprocessor constants those params that are not specified on the
// command line.
- if (origin.empty())
- origin = GetDefaultDevOrigin();
override_quic_origin_ = origin;
if (origin.empty())
origin = GetDefaultOrigin();
if (fallback_origin.empty())
- fallback_origin = GetDefaultDevFallbackOrigin();
- if (fallback_origin.empty())
fallback_origin = GetDefaultFallbackOrigin();
if (ssl_origin.empty())
ssl_origin = GetDefaultSSLOrigin();
@@ -498,14 +475,6 @@
return holdback_;
}
-std::string DataReductionProxyParams::GetDefaultDevOrigin() const {
- return params::IsDevRolloutEnabled() ? kDevOrigin : std::string();
-}
-
-std::string DataReductionProxyParams::GetDefaultDevFallbackOrigin() const {
- return params::IsDevRolloutEnabled() ? kDevFallbackOrigin : std::string();
-}
-
// TODO(kundaji): Remove tests for macro definitions.
std::string DataReductionProxyParams::GetDefaultOrigin() const {
const base::CommandLine& command_line =
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
index 0e5df1a..8080df1 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
@@ -107,10 +107,6 @@
// proxy server as quic://proxy.googlezip.net.
bool IsIncludedInQuicFieldTrial();
-// Returns true if dev rollout is enabled on this client either through command
-// line switch or as a part of field trial.
-bool IsDevRolloutEnabled();
-
std::string GetQuicFieldTrialName();
// Returns true if the Data Reduction Proxy config client should be used.
@@ -216,11 +212,6 @@
bool quic_enabled() const { return quic_enabled_; }
- // Returns the corresponding string from preprocessor constants if defined,
- // and an empty string otherwise.
- virtual std::string GetDefaultDevOrigin() const;
- virtual std::string GetDefaultDevFallbackOrigin() const;
-
protected:
// Test constructor that optionally won't call Init();
DataReductionProxyParams(int flags,
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.cc
index 5f62aee..6ee0a7ce 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.cc
@@ -6,8 +6,6 @@
namespace {
// Test values to replace the values specified in preprocessor defines.
-static const char kDefaultDevOrigin[] = "https://dev.net:443";
-static const char kDefaultDevFallbackOrigin[] = "dev.net:80";
static const char kDefaultOrigin[] = "origin.net:80";
static const char kDefaultFallbackOrigin[] = "fallback.net:80";
static const char kDefaultSSLOrigin[] = "ssl.net:1080";
@@ -37,14 +35,6 @@
proxies_for_http_ = proxies;
}
// Test values to replace the values specified in preprocessor defines.
-std::string TestDataReductionProxyParams::DefaultDevOrigin() {
- return kDefaultDevOrigin;
-}
-
-std::string TestDataReductionProxyParams::DefaultDevFallbackOrigin() {
- return kDefaultDevFallbackOrigin;
-}
-
std::string TestDataReductionProxyParams::DefaultOrigin() {
return kDefaultOrigin;
}
@@ -77,17 +67,6 @@
return kFlagSecureProxyCheckURL;
}
-std::string TestDataReductionProxyParams::GetDefaultDevOrigin() const {
- return GetDefinition(
- TestDataReductionProxyParams::HAS_DEV_ORIGIN, kDefaultDevOrigin);
-}
-
-std::string TestDataReductionProxyParams::GetDefaultDevFallbackOrigin() const {
- return GetDefinition(
- TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN,
- kDefaultDevFallbackOrigin);
-}
-
std::string TestDataReductionProxyParams::GetDefaultOrigin() const {
return GetDefinition(
TestDataReductionProxyParams::HAS_ORIGIN, kDefaultOrigin);
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h
index 83c7c64d..9096364 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h
@@ -26,12 +26,10 @@
// Used to emulate having constants defined by the preprocessor.
enum HasNames {
HAS_NOTHING = 0x0,
- HAS_DEV_ORIGIN = 0x1,
HAS_ORIGIN = 0x2,
HAS_FALLBACK_ORIGIN = 0x4,
HAS_SSL_ORIGIN = 0x08,
HAS_SECURE_PROXY_CHECK_URL = 0x40,
- HAS_DEV_FALLBACK_ORIGIN = 0x80,
HAS_EVERYTHING = 0xff,
};
@@ -42,8 +40,6 @@
void SetProxiesForHttp(const std::vector<net::ProxyServer>& proxies);
// Test values to replace the values specified in preprocessor defines.
- static std::string DefaultDevOrigin();
- static std::string DefaultDevFallbackOrigin();
static std::string DefaultOrigin();
static std::string DefaultFallbackOrigin();
static std::string DefaultSSLOrigin();
@@ -55,10 +51,6 @@
static std::string FlagSecureProxyCheckURL();
protected:
- std::string GetDefaultDevOrigin() const override;
-
- std::string GetDefaultDevFallbackOrigin() const override;
-
std::string GetDefaultOrigin() const override;
std::string GetDefaultFallbackOrigin() const override;
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
index fb3be91..662390d 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
@@ -71,21 +71,6 @@
DataReductionProxyParams::kPromoAllowed,
TestDataReductionProxyParams::HAS_EVERYTHING);
CheckParams(params, true, true, true, true);
- CheckValues(params, TestDataReductionProxyParams::DefaultDevOrigin(),
- TestDataReductionProxyParams::DefaultDevFallbackOrigin(),
- TestDataReductionProxyParams::DefaultSSLOrigin(),
- TestDataReductionProxyParams::DefaultSecureProxyCheckURL());
-}
-
-TEST_F(DataReductionProxyParamsTest, NoDevOrigin) {
- TestDataReductionProxyParams params(
- DataReductionProxyParams::kAllowed |
- DataReductionProxyParams::kFallbackAllowed |
- DataReductionProxyParams::kPromoAllowed,
- TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN);
- CheckParams(params, true, true, true, true);
CheckValues(params, TestDataReductionProxyParams::DefaultOrigin(),
TestDataReductionProxyParams::DefaultFallbackOrigin(),
TestDataReductionProxyParams::DefaultSSLOrigin(),
@@ -142,65 +127,22 @@
{true, true, true, TestDataReductionProxyParams::HAS_NOTHING, true},
{true, false, true, TestDataReductionProxyParams::HAS_NOTHING, true},
{false, true, true, TestDataReductionProxyParams::HAS_NOTHING, false},
- {true, true, true, TestDataReductionProxyParams::HAS_ORIGIN, true},
- {true,
- true,
- true,
- TestDataReductionProxyParams::HAS_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN,
- false},
- {true,
- false,
- true,
- TestDataReductionProxyParams::HAS_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN,
- false},
- {false,
- true,
- true,
- TestDataReductionProxyParams::HAS_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN,
- false},
- {true,
- true,
- true,
- TestDataReductionProxyParams::HAS_DEV_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN,
+ {true, true, true, TestDataReductionProxyParams::HAS_ORIGIN, false},
+ {true, false, true, TestDataReductionProxyParams::HAS_ORIGIN, false},
+ {false, true, true, TestDataReductionProxyParams::HAS_ORIGIN, false},
+ {true, true, true, TestDataReductionProxyParams::HAS_NOTHING, true},
+ {true, false, true, TestDataReductionProxyParams::HAS_FALLBACK_ORIGIN,
true},
- {true,
- false,
- true,
- TestDataReductionProxyParams::HAS_FALLBACK_ORIGIN,
- true},
- {false,
- true,
- true,
- TestDataReductionProxyParams::HAS_FALLBACK_ORIGIN,
+ {false, true, true, TestDataReductionProxyParams::HAS_FALLBACK_ORIGIN,
false},
- {true,
- true,
- true,
- TestDataReductionProxyParams::HAS_FALLBACK_ORIGIN |
- TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN,
+ {true, true, true, TestDataReductionProxyParams::HAS_FALLBACK_ORIGIN,
false},
- {true,
- true,
- true,
- TestDataReductionProxyParams::HAS_SECURE_PROXY_CHECK_URL,
- false},
- {true,
- false,
- true,
- TestDataReductionProxyParams::HAS_SECURE_PROXY_CHECK_URL,
- false},
- {false,
- true,
- true,
- TestDataReductionProxyParams::HAS_SECURE_PROXY_CHECK_URL,
- false},
+ {true, true, true,
+ TestDataReductionProxyParams::HAS_SECURE_PROXY_CHECK_URL, false},
+ {true, false, true,
+ TestDataReductionProxyParams::HAS_SECURE_PROXY_CHECK_URL, false},
+ {false, true, true,
+ TestDataReductionProxyParams::HAS_SECURE_PROXY_CHECK_URL, false},
{true, true, true, TestDataReductionProxyParams::HAS_SSL_ORIGIN, true},
{true, false, true, TestDataReductionProxyParams::HAS_SSL_ORIGIN, true},
{false, true, true, TestDataReductionProxyParams::HAS_SSL_ORIGIN, false},
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.cc
index d608ad7..0b21423 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.cc
@@ -17,9 +17,6 @@
// The URL from which to retrieve the Data Reduction Proxy configuration.
const char kDataReductionProxyConfigURL[] = "data-reduction-proxy-config-url";
-// The origin of the data reduction proxy dev.
-const char kDataReductionProxyDev[] = "spdy-proxy-dev-auth-origin";
-
// The name of a Data Reduction Proxy experiment to run. These experiments are
// defined by the proxy server. Use --force-fieldtrials for Data Reduction
// Proxy field trials.
@@ -68,10 +65,6 @@
// The origin of the data reduction SSL proxy.
const char kDataReductionSSLProxy[] = "data-reduction-ssl-proxy";
-// Disables the origin of the data reduction proxy dev.
-const char kDisableDataReductionProxyDev[] =
- "disable-spdy-proxy-dev-auth-origin";
-
// Enable the data reduction proxy.
const char kEnableDataReductionProxy[] = "enable-spdy-proxy-auth";
@@ -83,9 +76,6 @@
const char kEnableDataReductionProxyCarrierTest[] =
"enable-data-reduction-proxy-carrier-test";
-// Enables the origin of the data reduction proxy dev.
-const char kEnableDataReductionProxyDev[] = "enable-spdy-proxy-dev-auth-origin";
-
// Enables preview mode for Lo-Fi. This means a preview should be requested
// instead of placeholders whenever Lo-Fi mode is on. Lo-Fi must also be enabled
// via a flag or field trial.
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h b/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h
index 79c1455..b4d0c8f 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h
@@ -14,7 +14,6 @@
extern const char kClearDataReductionProxyDataSavings[];
extern const char kDataReductionProxy[];
extern const char kDataReductionProxyConfigURL[];
-extern const char kDataReductionProxyDev[];
extern const char kDataReductionProxyExperiment[];
extern const char kDataReductionProxyFallback[];
extern const char kDataReductionProxyHttpProxies[];
@@ -28,11 +27,9 @@
extern const char kDataReductionProxyStartSecureDisabled[];
extern const char kDataReductionProxyWarmupURL[];
extern const char kDataReductionSSLProxy[];
-extern const char kDisableDataReductionProxyDev[];
extern const char kEnableDataReductionProxy[];
extern const char kEnableDataReductionProxyBypassWarning[];
extern const char kEnableDataReductionProxyCarrierTest[];
-extern const char kEnableDataReductionProxyDev[];
extern const char kEnableDataReductionProxyLoFiPreview[];
} // namespace switches
