Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1889)

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

Issue 30883003: Simple fallback implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@patched
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h" 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h"
6 6
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "base/base64.h" 11 #include "base/base64.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/metrics/field_trial.h" 13 #include "base/metrics/field_trial.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/prefs/testing_pref_service.h" 15 #include "base/prefs/testing_pref_service.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 17 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
18 #include "chrome/browser/prefs/proxy_prefs.h" 18 #include "chrome/browser/prefs/proxy_prefs.h"
19 #include "chrome/browser/prefs/scoped_user_pref_update.h" 19 #include "chrome/browser/prefs/scoped_user_pref_update.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/metrics/variations/variations_util.h" 21 #include "chrome/common/metrics/variations/variations_util.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "components/variations/entropy_provider.h" 23 #include "components/variations/entropy_provider.h"
24 #include "net/url_request/test_url_fetcher_factory.h" 24 #include "net/url_request/test_url_fetcher_factory.h"
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
26 #include "url/gurl.h" 26 #include "url/gurl.h"
27 27
28 const char kDataReductionProxyOrigin[] = "https://foo:443/"; 28 const char kDataReductionProxyOrigin[] = "https://foo:443/";
29 const char kDataReductionProxyOriginHostPort[] = "foo:443"; 29 const char kDataReductionProxyOriginPAC[] = "HTTPS foo:443;";
30 const char kDataReductionProxyFallback[] = "http://bar:80/";
31 const char kDataReductionProxyFallbackPAC[] = "HTTP bar:80;";
30 const char kDataReductionProxyAuth[] = "12345"; 32 const char kDataReductionProxyAuth[] = "12345";
31 33
32 class TestDataReductionProxySettingsAndroid 34 class TestDataReductionProxySettingsAndroid
33 : public DataReductionProxySettingsAndroid { 35 : public DataReductionProxySettingsAndroid {
34 public: 36 public:
35 TestDataReductionProxySettingsAndroid(JNIEnv* env, 37 TestDataReductionProxySettingsAndroid(JNIEnv* env,
36 jobject obj, 38 jobject obj,
37 PrefService* profile_prefs, 39 PrefService* profile_prefs,
38 PrefService* local_state_prefs) 40 PrefService* local_state_prefs)
39 : DataReductionProxySettingsAndroid(env, obj), 41 : DataReductionProxySettingsAndroid(env, obj),
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 169
168 EXPECT_EQ(settings_->pac_bypass_rules_.size(), 1u); 170 EXPECT_EQ(settings_->pac_bypass_rules_.size(), 1u);
169 EXPECT_EQ("shExpMatch(url, 'http://foo.com/*')", 171 EXPECT_EQ("shExpMatch(url, 'http://foo.com/*')",
170 settings_->pac_bypass_rules_[0]); 172 settings_->pac_bypass_rules_[0]);
171 173
172 EXPECT_EQ(settings_->BypassRules().size(), 1u); 174 EXPECT_EQ(settings_->BypassRules().size(), 1u);
173 EXPECT_EQ("bar.com", settings_->BypassRules()[0]); 175 EXPECT_EQ("bar.com", settings_->BypassRules()[0]);
174 } 176 }
175 177
176 TEST_F(DataReductionProxySettingsAndroidTest, TestSetProxyPac) { 178 TEST_F(DataReductionProxySettingsAndroidTest, TestSetProxyPac) {
179 AddProxyToCommandLine();
177 settings_->AddDefaultProxyBypassRules(); 180 settings_->AddDefaultProxyBypassRules();
181 std::string raw_pac = settings_->GetProxyPacScript();
182 EXPECT_NE(raw_pac.find(kDataReductionProxyOriginPAC), std::string::npos);
183 EXPECT_NE(raw_pac.find(kDataReductionProxyFallbackPAC), std::string::npos);;
178 std::string pac; 184 std::string pac;
179 base::Base64Encode(settings_->GetProxyPacScript(), &pac); 185 base::Base64Encode(raw_pac, &pac);
180 std::string expected_pac_url = 186 std::string expected_pac_url =
181 "data:application/x-ns-proxy-autoconfig;base64," + pac; 187 "data:application/x-ns-proxy-autoconfig;base64," + pac;
182 // Test setting the PAC, without generating histograms. 188 // Test setting the PAC, without generating histograms.
183 settings_->SetHasTurnedOn(); 189 settings_->SetHasTurnedOn();
184 settings_->SetProxyConfigs(true, false); 190 settings_->SetProxyConfigs(true, false);
185 CheckProxyPacPref(expected_pac_url, 191 CheckProxyPacPref(expected_pac_url,
186 ProxyModeToString(ProxyPrefs::MODE_PAC_SCRIPT)); 192 ProxyModeToString(ProxyPrefs::MODE_PAC_SCRIPT));
187 193
188 // Test disabling the PAC, without generating histograms. 194 // Test disabling the PAC, without generating histograms.
189 settings_->SetHasTurnedOff(); 195 settings_->SetHasTurnedOff();
(...skipping 10 matching lines...) Expand all
200 ASSERT_EQ(static_cast<jsize>(spdyproxy::kNumDaysInHistory), java_array_len); 206 ASSERT_EQ(static_cast<jsize>(spdyproxy::kNumDaysInHistory), java_array_len);
201 207
202 jlong value; 208 jlong value;
203 for (size_t i = 0; i < spdyproxy::kNumDaysInHistory; ++i) { 209 for (size_t i = 0; i < spdyproxy::kNumDaysInHistory; ++i) {
204 env_->GetLongArrayRegion(result.obj(), i, 1, &value); 210 env_->GetLongArrayRegion(result.obj(), i, 1, &value);
205 ASSERT_EQ( 211 ASSERT_EQ(
206 static_cast<long>((spdyproxy::kNumDaysInHistory - 1 - i) * 2), value); 212 static_cast<long>((spdyproxy::kNumDaysInHistory - 1 - i) * 2), value);
207 } 213 }
208 } 214 }
209 215
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698