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

Side by Side Diff: chrome/browser/importer/firefox_proxy_settings_unittest.cc

Issue 3146029: Cleanup: rename ProxyRules::socks_proxy --> ProxyRules::fallback_proxy.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync and include a new chromeos file Created 10 years, 4 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 | « chrome/browser/importer/firefox_proxy_settings.cc ('k') | net/proxy/proxy_config.h » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/browser/importer/firefox_proxy_settings.h" 9 #include "chrome/browser/importer/firefox_proxy_settings.h"
10 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 EXPECT_EQ( 57 EXPECT_EQ(
58 "Automatic settings:\n" 58 "Automatic settings:\n"
59 " Auto-detect: No\n" 59 " Auto-detect: No\n"
60 " Custom PAC script: [None]\n" 60 " Custom PAC script: [None]\n"
61 "Manual settings:\n" 61 "Manual settings:\n"
62 " Proxy server: \n" 62 " Proxy server: \n"
63 " HTTP: http_proxy:1111\n" 63 " HTTP: http_proxy:1111\n"
64 " HTTPS: ssl_proxy:2222\n" 64 " HTTPS: ssl_proxy:2222\n"
65 " FTP: ftp_proxy:3333\n" 65 " FTP: ftp_proxy:3333\n"
66 " SOCKS: socks4://socks_host:5555\n" 66 " (fallback): socks4://socks_host:5555\n"
67 " Bypass list: \n" 67 " Bypass list: \n"
68 " *localhost\n" 68 " *localhost\n"
69 " 127.0.0.1\n" 69 " 127.0.0.1\n"
70 " *noproxy.com", 70 " *noproxy.com",
71 config.ToString()); 71 config.ToString());
72 } 72 }
73 73
74 TEST_F(FirefoxProxySettingsTest, TestParseAutoConfigUrl) { 74 TEST_F(FirefoxProxySettingsTest, TestParseAutoConfigUrl) {
75 FirefoxProxySettings settings; 75 FirefoxProxySettings settings;
76 76
(...skipping 26 matching lines...) Expand all
103 103
104 EXPECT_EQ( 104 EXPECT_EQ(
105 "Automatic settings:\n" 105 "Automatic settings:\n"
106 " Auto-detect: No\n" 106 " Auto-detect: No\n"
107 " Custom PAC script: http://custom-pac-url/\n" 107 " Custom PAC script: http://custom-pac-url/\n"
108 "Manual settings:\n" 108 "Manual settings:\n"
109 " Proxy server: [None]\n" 109 " Proxy server: [None]\n"
110 " Bypass list: [None]", 110 " Bypass list: [None]",
111 config.ToString()); 111 config.ToString());
112 } 112 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/firefox_proxy_settings.cc ('k') | net/proxy/proxy_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698