Commit e0791baf authored by bengr@chromium.org's avatar bengr@chromium.org

Removed requirement that data reduction proxy key be non-empty

The removes a check on initialization, because the key may be set
after initialization but before use.

BUG=382977

Review URL: https://codereview.chromium.org/347803003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278596 0039d316-1c4b-4281-b951-d872f2087c98
parent aa2ec2a1
...@@ -137,13 +137,6 @@ bool DataReductionProxyParams::Init( ...@@ -137,13 +137,6 @@ bool DataReductionProxyParams::Init(
return false; return false;
} }
if (allowed || alt_allowed) {
if (key_.empty()) {
DVLOG(1) << "Invalid key: <empty>";
return false;
}
}
if (fallback_allowed_ && !allowed_) { if (fallback_allowed_ && !allowed_) {
DVLOG(1) << "The data reduction proxy fallback cannot be allowed if " DVLOG(1) << "The data reduction proxy fallback cannot be allowed if "
<< "the data reduction proxy is not allowed"; << "the data reduction proxy is not allowed";
......
...@@ -200,27 +200,6 @@ TEST_F(DataReductionProxyParamsTest, Flags) { ...@@ -200,27 +200,6 @@ TEST_F(DataReductionProxyParamsTest, Flags) {
kFlagProbeURL); kFlagProbeURL);
} }
TEST_F(DataReductionProxyParamsTest, FlagsNoKey) {
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kDataReductionProxy, kFlagOrigin);
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kDataReductionProxyFallback, kFlagFallbackOrigin);
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kDataReductionSSLProxy, kFlagSSLOrigin);
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kDataReductionProxyAlt, kFlagAltOrigin);
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kDataReductionProxyAltFallback, kFlagAltFallbackOrigin);
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kDataReductionProxyProbeURL, kFlagProbeURL);
TestDataReductionProxyParams params(
DataReductionProxyParams::kAllowed |
DataReductionProxyParams::kFallbackAllowed |
DataReductionProxyParams::kAlternativeAllowed |
DataReductionProxyParams::kPromoAllowed, HAS_EVERYTHING);
EXPECT_FALSE(params.init_result());
}
TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) { TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) {
const struct { const struct {
bool allowed; bool allowed;
...@@ -231,7 +210,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) { ...@@ -231,7 +210,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) {
bool expected_result; bool expected_result;
} tests[] = { } tests[] = {
{ true, true, true, true, HAS_NOTHING, true }, { true, true, true, true, HAS_NOTHING, true },
{ true, true, true, true, HAS_KEY, false }, { true, true, true, true, HAS_KEY, true },
{ true, true, true, true, HAS_DEV_ORIGIN, true }, { true, true, true, true, HAS_DEV_ORIGIN, true },
{ true, true, true, true, HAS_ORIGIN, true }, { true, true, true, true, HAS_ORIGIN, true },
{ true, true, true, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false }, { true, true, true, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false },
...@@ -242,7 +221,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) { ...@@ -242,7 +221,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) {
{ true, true, true, true, HAS_PROBE_URL, false }, { true, true, true, true, HAS_PROBE_URL, false },
{ true, false, true, true, HAS_NOTHING, true }, { true, false, true, true, HAS_NOTHING, true },
{ true, false, true, true, HAS_KEY, false }, { true, false, true, true, HAS_KEY, true },
{ true, false, true, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false }, { true, false, true, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false },
{ true, false, true, true, HAS_FALLBACK_ORIGIN, true }, { true, false, true, true, HAS_FALLBACK_ORIGIN, true },
{ true, false, true, true, HAS_SSL_ORIGIN, false }, { true, false, true, true, HAS_SSL_ORIGIN, false },
...@@ -251,7 +230,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) { ...@@ -251,7 +230,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) {
{ true, false, true, true, HAS_PROBE_URL, false }, { true, false, true, true, HAS_PROBE_URL, false },
{ true, true, false, true, HAS_NOTHING, true }, { true, true, false, true, HAS_NOTHING, true },
{ true, true, false, true, HAS_KEY, false }, { true, true, false, true, HAS_KEY, true },
{ true, true, false, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false }, { true, true, false, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false },
{ true, true, false, true, HAS_FALLBACK_ORIGIN, false }, { true, true, false, true, HAS_FALLBACK_ORIGIN, false },
{ true, true, false, true, HAS_SSL_ORIGIN, true }, { true, true, false, true, HAS_SSL_ORIGIN, true },
...@@ -259,7 +238,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) { ...@@ -259,7 +238,7 @@ TEST_F(DataReductionProxyParamsTest, InvalidConfigurations) {
{ true, true, false, true, HAS_ALT_FALLBACK_ORIGIN, true }, { true, true, false, true, HAS_ALT_FALLBACK_ORIGIN, true },
{ true, true, false, true, HAS_PROBE_URL, false }, { true, true, false, true, HAS_PROBE_URL, false },
{ true, false, false, true, HAS_KEY, false }, { true, false, false, true, HAS_KEY, true },
{ true, false, false, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false }, { true, false, false, true, HAS_ORIGIN | HAS_DEV_ORIGIN, false },
{ true, false, false, true, HAS_FALLBACK_ORIGIN, true }, { true, false, false, true, HAS_FALLBACK_ORIGIN, true },
{ true, false, false, true, HAS_SSL_ORIGIN, true }, { true, false, false, true, HAS_SSL_ORIGIN, true },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment