Simple fallback implementation.

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_unittest.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/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
 #include "components/variations/entropy_provider.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 const char kDataReductionProxyOrigin[] = "https://foo:443/";
-const char kDataReductionProxyOriginHostPort[] = "foo:443";
+const char kDataReductionProxyOriginPAC[] = "HTTPS foo:443;";
+const char kDataReductionProxyFallback[] = "http://bar:80/";
+const char kDataReductionProxyFallbackPAC[] = "HTTP bar:80;";
 const char kDataReductionProxyAuth[] = "12345";
 
 class TestDataReductionProxySettingsAndroid
     : public DataReductionProxySettingsAndroid {
  public:
   TestDataReductionProxySettingsAndroid(JNIEnv* env,
                                         jobject obj,
                                         PrefService* profile_prefs,
                                         PrefService* local_state_prefs)
       : DataReductionProxySettingsAndroid(env, obj),
         success_(false),
         fake_fetcher_request_count_(0),
         profile_prefs_(profile_prefs),
         local_state_prefs_(local_state_prefs) {
   }
 
   // DataReductionProxySettings implementation:
   virtual net::URLFetcher* GetURLFetcher() OVERRIDE {
     if (test_url_.empty())
       return NULL;
     net::URLFetcher* fetcher =
         new net::FakeURLFetcher(GURL(test_url_), this, response_, success_);
     fake_fetcher_request_count_++;
     return fetcher;
   }
 
   virtual PrefService* GetOriginalProfilePrefs() OVERRIDE {

[bengr, 2013/10/22 17:49:30]

Use MOCKs? Also this seems awfully similar to the test class for the base class.
Is it possible to combine?

[marq (ping after 24h), 2013/10/22 21:18:01]

MOCKS: See previous comment.

I tried. The obvious way would seem to be to have this class inherit from both
DataReductionProxySettingsAndroid and TestDataReductionProxySettings, but I
wasn't able to get that to work.

[bengr, 2013/10/22 21:44:21]

Hmm. Add a TODO to revisit.

     return profile_prefs_;
   }
+
   virtual PrefService* GetLocalStatePrefs() OVERRIDE {
     return local_state_prefs_;
   }
 
+  virtual std::string GetDefaultProxyHost() OVERRIDE { return std::string(); }

[bengr, 2013/10/22 17:49:30]

move return to new line.

[marq (ping after 24h), 2013/10/22 21:18:01]

Done.

+  virtual std::string GetDefaultFallbackProxyHost() OVERRIDE {
+    return std::string();
+  }
+
   void set_probe_result(const std::string& test_url,
                         const std::string& response,
                         bool success) {
     test_url_ = test_url;
     response_ = response;
     success_ = success;
   }
 
   const int fake_fetcher_request_count() {
     return fake_fetcher_request_count_;
@@ skipping 52 matching lines @@
 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));
 }
 
-TEST_F(DataReductionProxySettingsAndroidTest, TestGetDataReductionProxyAuth) {
-  AddProxyToCommandLine();
-  // SetUp() adds the auth string to the command line, which should be returned
-  // here.
-  ScopedJavaLocalRef<jstring> result =
-      settings_->GetDataReductionProxyAuth(env_, NULL);
-  ASSERT_TRUE(result.obj());
-  const base::android::JavaRef<jstring>& str_ref = result;
-  EXPECT_EQ(kDataReductionProxyAuth, ConvertJavaStringToUTF8(str_ref));
-}
-
-// Test that the auth value set by preprocessor directive is not returned
-// when an origin is set via a switch. This test only does anything useful in
-// Chrome builds.
-TEST_F(DataReductionProxySettingsAndroidTest,
-       TestGetDataReductionProxyAuthWithOriginSetViaSwitch) {
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kSpdyProxyAuthOrigin, kDataReductionProxyOrigin);
-  // SetUp() adds the auth string to the command line, which should be returned
-  // here.
-  ScopedJavaLocalRef<jstring> result =
-      settings_->GetDataReductionProxyAuth(env_, NULL);
-  ASSERT_TRUE(result.obj());
-  const base::android::JavaRef<jstring>& str_ref = result;
-  EXPECT_EQ(std::string(), ConvertJavaStringToUTF8(str_ref));
-}
-
 // Confirm that the bypass rule functions generate the intended JavaScript
 // code for the Proxy PAC.
 TEST_F(DataReductionProxySettingsAndroidTest, TestBypassPACRules) {
   settings_->AddURLPatternToBypass("http://foo.com/*");
   settings_->AddHostPatternToBypass("bar.com");
 
   EXPECT_EQ(settings_->pac_bypass_rules_.size(), 1u);
   EXPECT_EQ("shExpMatch(url, 'http://foo.com/*')",
             settings_->pac_bypass_rules_[0]);
 
   EXPECT_EQ(settings_->BypassRules().size(), 1u);
   EXPECT_EQ("bar.com", settings_->BypassRules()[0]);
 }
 
 TEST_F(DataReductionProxySettingsAndroidTest, TestSetProxyPac) {
+  AddProxyToCommandLine();
   settings_->AddDefaultProxyBypassRules();
+  std::string raw_pac = settings_->GetProxyPacScript();
+  EXPECT_NE(raw_pac.find(kDataReductionProxyOriginPAC), std::string::npos);
+  EXPECT_NE(raw_pac.find(kDataReductionProxyFallbackPAC), std::string::npos);;
   std::string pac;
-  base::Base64Encode(settings_->GetProxyPacScript(), &pac);
+  base::Base64Encode(raw_pac, &pac);
   std::string expected_pac_url =
       "data:application/x-ns-proxy-autoconfig;base64," + pac;
   // Test setting the PAC, without generating histograms.
   settings_->SetHasTurnedOn();
   settings_->SetProxyConfigs(true, false);
   CheckProxyPacPref(expected_pac_url,
                     ProxyModeToString(ProxyPrefs::MODE_PAC_SCRIPT));
 
   // Test disabling the PAC, without generating histograms.
   settings_->SetHasTurnedOff();
@@ skipping 10 matching lines @@
   ASSERT_EQ(static_cast<jsize>(spdyproxy::kNumDaysInHistory), java_array_len);
 
   jlong value;
   for (size_t i = 0; i < spdyproxy::kNumDaysInHistory; ++i) {
     env_->GetLongArrayRegion(result.obj(), i, 1, &value);
     ASSERT_EQ(
         static_cast<long>((spdyproxy::kNumDaysInHistory - 1 - i) * 2), value);
   }
 }