OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // proxy api test | 5 // proxy api test |
6 // browser_tests.exe | 6 // browser_tests.exe |
7 // --gtest_filter=ProxySettingsApiTest.ProxyFixedIndividualIncognitoAlso | 7 // --gtest_filter=ProxySettingsApiTest.ProxyFixedIndividualIncognitoAlso |
8 | 8 |
9 chrome.test.runTests([ | 9 chrome.test.runTests([ |
10 // Verify that execution has started to make sure flaky timeouts are not | 10 // Verify that execution has started to make sure flaky timeouts are not |
(...skipping 21 matching lines...) Expand all Loading... |
32 | 32 |
33 var rules = { | 33 var rules = { |
34 proxyForHttp: httpProxy, | 34 proxyForHttp: httpProxy, |
35 proxyForHttps: httpsProxy, | 35 proxyForHttps: httpsProxy, |
36 proxyForFtp: ftpProxy, | 36 proxyForFtp: ftpProxy, |
37 fallbackProxy: fallbackProxy, | 37 fallbackProxy: fallbackProxy, |
38 }; | 38 }; |
39 | 39 |
40 var config = { rules: rules, mode: "fixed_servers" }; | 40 var config = { rules: rules, mode: "fixed_servers" }; |
41 chrome.proxy.settings.set( | 41 chrome.proxy.settings.set( |
42 {'value': config, 'incognito': false}, | 42 {'value': config, 'scope': 'regular'}, |
43 chrome.test.callbackPass()); | 43 chrome.test.callbackPass()); |
44 }, | 44 }, |
45 function setIndividualProxiesIncognito() { | 45 function setIndividualProxiesIncognito() { |
46 var httpProxy = { | 46 var httpProxy = { |
47 host: "5.5.5.5" | 47 host: "5.5.5.5" |
48 }; | 48 }; |
49 var httpsProxy = { | 49 var httpsProxy = { |
50 scheme: "socks5", | 50 scheme: "socks5", |
51 host: "6.6.6.6" | 51 host: "6.6.6.6" |
52 }; | 52 }; |
53 var ftpProxy = { | 53 var ftpProxy = { |
54 host: "7.7.7.7", | 54 host: "7.7.7.7", |
55 port: 9000 | 55 port: 9000 |
56 }; | 56 }; |
57 var fallbackProxy = { | 57 var fallbackProxy = { |
58 scheme: "socks4", | 58 scheme: "socks4", |
59 host: "8.8.8.8", | 59 host: "8.8.8.8", |
60 port: 9090 | 60 port: 9090 |
61 }; | 61 }; |
62 | 62 |
63 var rules = { | 63 var rules = { |
64 proxyForHttp: httpProxy, | 64 proxyForHttp: httpProxy, |
65 proxyForHttps: httpsProxy, | 65 proxyForHttps: httpsProxy, |
66 proxyForFtp: ftpProxy, | 66 proxyForFtp: ftpProxy, |
67 fallbackProxy: fallbackProxy, | 67 fallbackProxy: fallbackProxy, |
68 }; | 68 }; |
69 | 69 |
70 var config = { rules: rules, mode: "fixed_servers" }; | 70 var config = { rules: rules, mode: "fixed_servers" }; |
71 chrome.proxy.settings.set( | 71 chrome.proxy.settings.set( |
72 {'value': config, 'incognito': true}, | 72 {'value': config, 'scope': 'incognito_persistent'}, |
73 chrome.test.callbackPass()); | 73 chrome.test.callbackPass()); |
74 } | 74 } |
75 ]); | 75 ]); |
OLD | NEW |