Added alternative configuration for the data reduction proxy

components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc

Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
index d6475144744923f6bbbd649c2b0338d541179d15..a9856834b5a8270bce2c4c52c8b6ed80153f905b 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
@@ -19,7 +19,7 @@ using testing::Return;
 namespace {
 
 const char kDataReductionProxy[] = "https://foo.com:443/";
-const char kDataReductionProxyFallback[] = "http://bar.com:80";
+const char kDataReductionProxyFallback[] = "http://bar.com:80/";
 const char kDataReductionProxyKey[] = "12345";
 
 const char kProbeURLWithOKResponse[] = "http://ok.org/";
@@ -49,20 +49,44 @@ ProbeURLFetchResult FetchResult(bool enabled, bool success) {
   return FAILED_PROXY_ALREADY_DISABLED;
 }
 
+TestDataReductionProxyConfig::TestDataReductionProxyConfig()
+    : enabled_(false),
+      restricted_(false),
+      fallback_restricted_(false) {}
+
 void TestDataReductionProxyConfig::Enable(
     bool restricted,
     bool fallback_restricted,
     const std::string& primary_origin,
-    const std::string& fallback_origin) {
+    const std::string& fallback_origin,
+    const std::string& ssl_origin) {
   enabled_ = true;
   restricted_ = restricted;
   fallback_restricted_ = fallback_restricted;
+  origin_ = primary_origin;
+  fallback_origin_ = fallback_origin;
+  ssl_origin_ = ssl_origin;
 }
 
 void TestDataReductionProxyConfig::Disable() {
   enabled_ = false;
   restricted_ = false;
   fallback_restricted_ = false;
+  origin_ = "";
+  fallback_origin_ = "";
+  ssl_origin_ = "";
+}
+
+// static
+void DataReductionProxySettingsTestBase::AddTestProxyToCommandLine() {
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kDataReductionProxy, kDataReductionProxy);
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kDataReductionProxyFallback, kDataReductionProxyFallback);
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kDataReductionProxyKey, kDataReductionProxyKey);
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kDataReductionProxyProbeURL, kProbeURLWithOKResponse);
 }
 
 DataReductionProxySettingsTestBase::DataReductionProxySettingsTestBase()
@@ -72,18 +96,11 @@ DataReductionProxySettingsTestBase::DataReductionProxySettingsTestBase()
 DataReductionProxySettingsTestBase::~DataReductionProxySettingsTestBase() {}
 
 void DataReductionProxySettingsTestBase::AddProxyToCommandLine() {
-  DataReductionProxySettings::SetAllowed(true);
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kDataReductionProxy, kDataReductionProxy);
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kDataReductionProxyFallback, kDataReductionProxyFallback);
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kDataReductionProxyKey, kDataReductionProxyKey);
+  AddTestProxyToCommandLine();
 }
 
 // testing::Test implementation:
 void DataReductionProxySettingsTestBase::SetUp() {
-  DataReductionProxySettings::SetAllowed(true);
   PrefRegistrySimple* registry = pref_service_.registry();
   registry->RegisterListPref(prefs::kDailyHttpOriginalContentLength);
   registry->RegisterListPref(prefs::kDailyHttpReceivedContentLength);
@@ -91,9 +108,11 @@ void DataReductionProxySettingsTestBase::SetUp() {
                               0L);
   registry->RegisterDictionaryPref(kProxy);
   registry->RegisterBooleanPref(prefs::kDataReductionProxyEnabled, false);
+  registry->RegisterBooleanPref(prefs::kDataReductionProxyAltEnabled, false);
   registry->RegisterBooleanPref(prefs::kDataReductionProxyWasEnabledBefore,
                                 false);
-  ResetSettings();
+  AddProxyToCommandLine();
+  ResetSettings(true, true, false, true);
 
   ListPrefUpdate original_update(&pref_service_,
                                  prefs::kDailyHttpOriginalContentLength);
@@ -111,9 +130,21 @@ void DataReductionProxySettingsTestBase::SetUp() {
 }
 
 template <class C>
-void DataReductionProxySettingsTestBase::ResetSettings() {
+void DataReductionProxySettingsTestBase::ResetSettings(bool allowed,
+                                                       bool fallback_allowed,
+                                                       bool alt_allowed,
+                                                       bool promo_allowed) {
+  int flags = 0;
+  if (allowed)
+    flags |= DataReductionProxyParams::kAllowed;
+  if (fallback_allowed)
+    flags |= DataReductionProxyParams::kFallbackAllowed;
+  if (alt_allowed)
+    flags |= DataReductionProxyParams::kAlternativeAllowed;
+  if (promo_allowed)
+    flags |= DataReductionProxyParams::kPromoAllowed;
   MockDataReductionProxySettings<C>* settings =
-      new MockDataReductionProxySettings<C>();
+      new MockDataReductionProxySettings<C>(flags);
   EXPECT_CALL(*settings, GetOriginalProfilePrefs())
       .Times(AnyNumber())
       .WillRepeatedly(Return(&pref_service_));
@@ -123,12 +154,13 @@ void DataReductionProxySettingsTestBase::ResetSettings() {
   EXPECT_CALL(*settings, GetURLFetcher()).Times(0);
   EXPECT_CALL(*settings, LogProxyState(_, _, _)).Times(0);
   settings_.reset(settings);
-  settings_->config_.reset(new TestDataReductionProxyConfig());
+  settings_->configurator_.reset(new TestDataReductionProxyConfig());
 }
 
 // Explicitly generate required instantiations.
 template void
-DataReductionProxySettingsTestBase::ResetSettings<DataReductionProxySettings>();
+DataReductionProxySettingsTestBase::ResetSettings<DataReductionProxySettings>(
+    bool allowed, bool fallback_allowed, bool alt_allowed, bool promo_allowed);
 
 template <class C>
 void DataReductionProxySettingsTestBase::SetProbeResult(
@@ -170,7 +202,8 @@ void DataReductionProxySettingsTestBase::CheckProxyConfigs(
     bool expected_restricted,
     bool expected_fallback_restricted) {
   TestDataReductionProxyConfig* config =
-      static_cast<TestDataReductionProxyConfig*>(settings_->config_.get());
+      static_cast<TestDataReductionProxyConfig*>(
+          settings_->configurator_.get());
   ASSERT_EQ(expected_restricted, config->restricted_);
   ASSERT_EQ(expected_fallback_restricted, config->fallback_restricted_);
   ASSERT_EQ(expected_enabled, config->enabled_);
@@ -242,7 +275,6 @@ void DataReductionProxySettingsTestBase::CheckOnPrefChange(
 
 void DataReductionProxySettingsTestBase::CheckInitDataReductionProxy(
     bool enabled_at_startup) {
-  AddProxyToCommandLine();
   base::MessageLoopForUI loop;
   SetProbeResult(kProbeURLWithOKResponse,
                  "OK",