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

Side by Side Diff: net/proxy/proxy_config_service_linux_unittest.cc

Issue 10210015: Merge 133802 - Linux: Add support for new KDE space-delimited proxy port numbers. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1084/src/
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/proxy/proxy_config_service_linux.h" 5 #include "net/proxy/proxy_config_service_linux.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 false, // auto_detect 1148 false, // auto_detect
1149 GURL(), // pac_url 1149 GURL(), // pac_url
1150 ProxyRulesExpectation::PerScheme( 1150 ProxyRulesExpectation::PerScheme(
1151 "www.google.com:88", // http 1151 "www.google.com:88", // http
1152 "", // https 1152 "", // https
1153 "", // ftp 1153 "", // ftp
1154 ""), // bypass rules 1154 ""), // bypass rules
1155 }, 1155 },
1156 1156
1157 { 1157 {
1158 TEST_DESC("Only HTTP proxy specified, different port, space-delimited"),
1159
1160 // Input.
1161 "[Proxy Settings]\nProxyType=1\n"
1162 "httpProxy=www.google.com 88\n",
1163 {}, // env_values
1164
1165 // Expected result.
1166 ProxyConfigService::CONFIG_VALID,
1167 false, // auto_detect
1168 GURL(), // pac_url
1169 ProxyRulesExpectation::PerScheme(
1170 "www.google.com:88", // http
1171 "", // https
1172 "", // ftp
1173 ""), // bypass rules
1174 },
1175
1176 {
1158 TEST_DESC("Bypass *.google.com"), 1177 TEST_DESC("Bypass *.google.com"),
1159 1178
1160 // Input. 1179 // Input.
1161 "[Proxy Settings]\nProxyType=1\nhttpProxy=www.google.com\n" 1180 "[Proxy Settings]\nProxyType=1\nhttpProxy=www.google.com\n"
1162 "NoProxyFor=.google.com\n", 1181 "NoProxyFor=.google.com\n",
1163 {}, // env_values 1182 {}, // env_values
1164 1183
1165 // Expected result. 1184 // Expected result.
1166 ProxyConfigService::CONFIG_VALID, 1185 ProxyConfigService::CONFIG_VALID,
1167 false, // auto_detect 1186 false, // auto_detect
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 ProxyConfig config; 1560 ProxyConfig config;
1542 sync_config_getter.SetupAndInitialFetch(); 1561 sync_config_getter.SetupAndInitialFetch();
1543 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, 1562 EXPECT_EQ(ProxyConfigService::CONFIG_VALID,
1544 sync_config_getter.SyncGetLatestProxyConfig(&config)); 1563 sync_config_getter.SyncGetLatestProxyConfig(&config));
1545 EXPECT_TRUE(config.auto_detect()); 1564 EXPECT_TRUE(config.auto_detect());
1546 EXPECT_EQ(GURL(), config.pac_url()); 1565 EXPECT_EQ(GURL(), config.pac_url());
1547 } 1566 }
1548 } 1567 }
1549 1568
1550 } // namespace net 1569 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698