Added alternative configuration for the data reduction proxy

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
index 0416461c20b943127a027ff815a380597a54309e..65d97d9b7b1f128cc28f758259b28230a5c652d1 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
@@ -26,9 +26,19 @@ const char kDataReductionProxyOrigin[] = "https://foo.com:443/";
 const char kDataReductionProxyDev[] = "http://foo-dev.com:80";
 
 template <class C>
-void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings() {
+void data_reduction_proxy::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_));
@@ -68,7 +78,10 @@ void data_reduction_proxy::DataReductionProxySettingsTestBase::SetProbeResult(
 
 template void
 data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings<
-    DataReductionProxySettingsAndroid>();
+    DataReductionProxySettingsAndroid>(bool allowed,
+                                       bool fallback_allowed,
+                                       bool alt_allowed,
+                                       bool promo_allowed);
 
 template void
 data_reduction_proxy::DataReductionProxySettingsTestBase::SetProbeResult<
@@ -86,6 +99,7 @@ class DataReductionProxySettingsAndroidTest
   virtual void SetUp() OVERRIDE {
     env_ = base::android::AttachCurrentThread();
     DataReductionProxySettingsAndroid::Register(env_);
+    DataReductionProxySettingsTestBase::AddProxyToCommandLine();
     DataReductionProxySettingsTestBase::SetUp();
   }
 
@@ -97,26 +111,27 @@ class DataReductionProxySettingsAndroidTest
 };
 
 TEST_F(DataReductionProxySettingsAndroidTest, TestGetDataReductionProxyOrigin) {
-  AddProxyToCommandLine();
   // SetUp() adds the origin to the command line, which should be returned here.
   ScopedJavaLocalRef<jstring> result =
       Settings()->GetDataReductionProxyOrigin(env_, NULL);
   ASSERT_TRUE(result.obj());
   const base::android::JavaRef<jstring>& str_ref = result;
-  EXPECT_EQ(kDataReductionProxyOrigin, ConvertJavaStringToUTF8(str_ref));
+  EXPECT_EQ(GURL(kDataReductionProxyOrigin),
+            GURL(ConvertJavaStringToUTF8(str_ref)));
 }
 
 TEST_F(DataReductionProxySettingsAndroidTest,
        TestGetDataReductionProxyDevOrigin) {
-  AddProxyToCommandLine();
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       data_reduction_proxy::switches::kDataReductionProxyDev,
       kDataReductionProxyDev);
+  ResetSettings(true, true, false, true);
   ScopedJavaLocalRef<jstring> result =
       Settings()->GetDataReductionProxyOrigin(env_, NULL);
   ASSERT_TRUE(result.obj());
   const base::android::JavaRef<jstring>& str_ref = result;
-  EXPECT_EQ(kDataReductionProxyDev, ConvertJavaStringToUTF8(str_ref));
+  EXPECT_EQ(GURL(kDataReductionProxyDev),
+            GURL(ConvertJavaStringToUTF8(str_ref)));
 }
 
 TEST_F(DataReductionProxySettingsAndroidTest, TestGetDailyContentLengths) {