Revert 273810 "Added alternative configuration for the data redu..."

trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

Index: trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
===================================================================
--- trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc	(revision 273823)
+++ trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc	(working copy)
@@ -26,19 +26,9 @@
 const char kDataReductionProxyDev[] = "http://foo-dev.com:80";
 
 template <class C>
-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;
+void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings() {
   MockDataReductionProxySettings<C>* settings =
-      new MockDataReductionProxySettings<C>(flags);
+      new MockDataReductionProxySettings<C>;
   EXPECT_CALL(*settings, GetOriginalProfilePrefs())
       .Times(AnyNumber())
       .WillRepeatedly(Return(&pref_service_));
@@ -78,10 +68,7 @@
 
 template void
 data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings<
-    DataReductionProxySettingsAndroid>(bool allowed,
-                                       bool fallback_allowed,
-                                       bool alt_allowed,
-                                       bool promo_allowed);
+    DataReductionProxySettingsAndroid>();
 
 template void
 data_reduction_proxy::DataReductionProxySettingsTestBase::SetProbeResult<
@@ -99,7 +86,6 @@
   virtual void SetUp() OVERRIDE {
     env_ = base::android::AttachCurrentThread();
     DataReductionProxySettingsAndroid::Register(env_);
-    DataReductionProxySettingsTestBase::AddProxyToCommandLine();
     DataReductionProxySettingsTestBase::SetUp();
   }
 
@@ -111,27 +97,26 @@
 };
 
 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(GURL(kDataReductionProxyOrigin),
-            GURL(ConvertJavaStringToUTF8(str_ref)));
+  EXPECT_EQ(kDataReductionProxyOrigin, 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(GURL(kDataReductionProxyDev),
-            GURL(ConvertJavaStringToUTF8(str_ref)));
+  EXPECT_EQ(kDataReductionProxyDev, ConvertJavaStringToUTF8(str_ref));
 }
 
 TEST_F(DataReductionProxySettingsAndroidTest, TestGetDailyContentLengths) {