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

Side by Side Diff: components/data_reduction_proxy/browser/data_reduction_proxy_params.cc

Issue 607163002: Copy latest data reduction proxy urls to params. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comment for kDefaultSslOrigin. Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" 5 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h " 13 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h "
14 #include "net/base/host_port_pair.h" 14 #include "net/base/host_port_pair.h"
15 #include "net/proxy/proxy_config.h" 15 #include "net/proxy/proxy_config.h"
16 #include "net/proxy/proxy_info.h" 16 #include "net/proxy/proxy_info.h"
17 #include "net/proxy/proxy_retry_info.h" 17 #include "net/proxy/proxy_retry_info.h"
18 #include "net/proxy/proxy_server.h" 18 #include "net/proxy/proxy_server.h"
19 #include "net/proxy/proxy_service.h" 19 #include "net/proxy/proxy_service.h"
20 #include "net/url_request/url_request.h" 20 #include "net/url_request/url_request.h"
21 #include "net/url_request/url_request_context.h" 21 #include "net/url_request/url_request_context.h"
22 #include "url/url_constants.h" 22 #include "url/url_constants.h"
23 23
24 using base::FieldTrialList; 24 using base::FieldTrialList;
25 25
26 namespace { 26 namespace {
27 27
28 const char kEnabled[] = "Enabled"; 28 const char kEnabled[] = "Enabled";
29 const char kDefaultOrigin[] = "https://proxy.googlezip.net:443/"; 29 const char kDefaultOrigin[] = "https://proxy.googlezip.net:443/";
30 const char kDevOrigin[] = "http://proxy-dev.googlezip.net:443/"; 30 const char kDevOrigin[] = "https://proxy-dev.googlezip.net:443/";
31 const char kDevFallbackOrigin[] = "http://proxy-dev.googlezip.net:80/"; 31 const char kDevFallbackOrigin[] = "http://proxy-dev.googlezip.net:80/";
32 const char kDefaultFallbackOrigin[] = "http://compress.googlezip.net:80/"; 32 const char kDefaultFallbackOrigin[] = "http://compress.googlezip.net:80/";
33 const char kDefaultSslOrigin[] = "http://ssl.googlezip.net:1043/"; 33 // This is for a proxy that supports HTTP CONNECT to tunnel SSL traffic.
34 const char kDefaultAltOrigin[] = "https://proxy.googlezip.net:443/"; 34 // The proxy listens on port 443, but uses the HTTP protocol to set up
35 const char kDefaultAltFallbackOrigin[] = "http://compress.googlezip.net:80/"; 35 // the tunnel, not HTTPS.
36 const char kDefaultSslOrigin[] = "http://ssl.googlezip.net:443/";
37 const char kDefaultAltOrigin[] = "http://ssl.googlezip.net:80/";
38 const char kDefaultAltFallbackOrigin[] = "http://ssl.googlezip.net:80/";
36 const char kDefaultProbeUrl[] = "http://check.googlezip.net/connect"; 39 const char kDefaultProbeUrl[] = "http://check.googlezip.net/connect";
37 const char kDefaultWarmupUrl[] = "http://www.gstatic.com/generate_204"; 40 const char kDefaultWarmupUrl[] = "http://www.gstatic.com/generate_204";
38 41
39 } // namespace 42 } // namespace
40 43
41 namespace data_reduction_proxy { 44 namespace data_reduction_proxy {
42 45
43 // static 46 // static
44 bool DataReductionProxyParams::IsIncludedInAlternativeFieldTrial() { 47 bool DataReductionProxyParams::IsIncludedInAlternativeFieldTrial() {
45 const std::string group_name = base::FieldTrialList::FindFullName( 48 const std::string group_name = base::FieldTrialList::FindFullName(
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 511
509 std::string DataReductionProxyParams::GetDefaultProbeURL() const { 512 std::string DataReductionProxyParams::GetDefaultProbeURL() const {
510 return kDefaultProbeUrl; 513 return kDefaultProbeUrl;
511 } 514 }
512 515
513 std::string DataReductionProxyParams::GetDefaultWarmupURL() const { 516 std::string DataReductionProxyParams::GetDefaultWarmupURL() const {
514 return kDefaultWarmupUrl; 517 return kDefaultWarmupUrl;
515 } 518 }
516 519
517 } // namespace data_reduction_proxy 520 } // namespace data_reduction_proxy
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698