Move data reduction proxy to Chrome-Proxy header for authentication

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::Return;
 
-const char kDataReductionProxyOrigin[] = "https://foo.com:443/";
 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;
@@ skipping 58 matching lines @@
                                        int expected_calls);
 
 class DataReductionProxySettingsAndroidTest
     : public data_reduction_proxy::ConcreteDataReductionProxySettingsTest<
         DataReductionProxySettingsAndroid> {
  public:
   // DataReductionProxySettingsTest implementation:
   virtual void SetUp() OVERRIDE {
     env_ = base::android::AttachCurrentThread();
     DataReductionProxySettingsAndroid::Register(env_);
-    DataReductionProxySettingsTestBase::AddProxyToCommandLine();
     DataReductionProxySettingsTestBase::SetUp();
   }
 
   DataReductionProxySettingsAndroid* Settings() {
     return static_cast<DataReductionProxySettingsAndroid*>(settings_.get());
   }
 
   JNIEnv* env_;
 };
 
 TEST_F(DataReductionProxySettingsAndroidTest, TestGetDataReductionProxyOrigin) {
   // 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),
+  EXPECT_EQ(GURL(expected_params_->DefaultOrigin()),

[mef, 2014/06/24 17:41:56]

Could you explain this change?

[bengr, 2014/06/24 19:01:50]

I'm hoping marq@ can review this code. In a nutshell, I added a
TestDataReductionProxyParams class so that we could test such expectations more
consistently across all data reduction proxy tests.

             GURL(ConvertJavaStringToUTF8(str_ref)));
 }
 
 TEST_F(DataReductionProxySettingsAndroidTest,
        TestGetDataReductionProxyDevOrigin) {
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       data_reduction_proxy::switches::kDataReductionProxyDev,
       kDataReductionProxyDev);
   ResetSettings(true, true, false, true);
   ScopedJavaLocalRef<jstring> result =
@@ skipping 16 matching lines @@
   jlong value;
   for (size_t i = 0; i < data_reduction_proxy::kNumDaysInHistory; ++i) {
     env_->GetLongArrayRegion(result.obj(), i, 1, &value);
     ASSERT_EQ(
         static_cast<long>(
             (data_reduction_proxy::kNumDaysInHistory - 1 - i) * 2),
         value);
   }
 }