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

Side by Side Diff: chrome/test/data/extensions/api_test/proxy/bypass/test.js

Issue 6992022: Move Proxy Settings API out of experimental (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed remainder of merge conflict. Fixes unit test Created 9 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
OLDNEW
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 --gtest_filter=ProxySettingsApiTest.ProxyBypass 6 // browser_tests.exe --gtest_filter=ProxySettingsApiTest.ProxyBypass
7 7
8 function expect(expected, message) { 8 function expect(expected, message) {
9 return chrome.test.callbackPass(function(value) { 9 return chrome.test.callbackPass(function(value) {
10 chrome.test.assertEq(expected, value, message); 10 chrome.test.assertEq(expected, value, message);
(...skipping 21 matching lines...) Expand all
32 var config = { rules: rules, mode: "fixed_servers" }; 32 var config = { rules: rules, mode: "fixed_servers" };
33 var configExpected = { rules: rulesExpected, mode: "fixed_servers" }; 33 var configExpected = { rules: rulesExpected, mode: "fixed_servers" };
34 34
35 chrome.test.runTests([ 35 chrome.test.runTests([
36 // Verify that execution has started to make sure flaky timeouts are not 36 // Verify that execution has started to make sure flaky timeouts are not
37 // caused by us. 37 // caused by us.
38 function verifyTestsHaveStarted() { 38 function verifyTestsHaveStarted() {
39 chrome.test.succeed(); 39 chrome.test.succeed();
40 }, 40 },
41 function setIndividualProxies() { 41 function setIndividualProxies() {
42 chrome.experimental.proxy.settings.set( 42 chrome.proxy.settings.set(
43 {'value': config}, 43 {'value': config},
44 chrome.test.callbackPass()); 44 chrome.test.callbackPass());
45 }, 45 },
46 function verifyRegular() { 46 function verifyRegular() {
47 chrome.experimental.proxy.settings.get( 47 chrome.proxy.settings.get(
48 {'incognito': false}, 48 {'incognito': false},
49 expect({ 'value': configExpected, 49 expect({ 'value': configExpected,
50 'levelOfControl': "ControlledByThisExtension" }, 50 'levelOfControl': "ControlledByThisExtension" },
51 "invalid proxy settings")); 51 "invalid proxy settings"));
52 }, 52 },
53 function verifyIncognito() { 53 function verifyIncognito() {
54 chrome.experimental.proxy.settings.get( 54 chrome.proxy.settings.get(
55 {'incognito': true}, 55 {'incognito': true},
56 expect({ 'value': configExpected, 56 expect({ 'value': configExpected,
57 'incognitoSpecific': false, 57 'incognitoSpecific': false,
58 'levelOfControl': "ControlledByThisExtension" }, 58 'levelOfControl': "ControlledByThisExtension" },
59 "invalid proxy settings")); 59 "invalid proxy settings"));
60 } 60 }
61 ]); 61 ]);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698