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

Side by Side Diff: chrome/test/data/extensions/api_test/proxy/individual_remove/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 6 // browser_tests.exe
7 // --gtest_filter=ProxySettingsApiTest.ProxyFixedIndividualRemove 7 // --gtest_filter=ProxySettingsApiTest.ProxyFixedIndividualRemove
8 8
9 var httpProxy = { 9 var httpProxy = {
10 host: "1.1.1.1" 10 host: "1.1.1.1"
(...skipping 21 matching lines...) Expand all
32 32
33 var config = { rules: rules, mode: "fixed_servers" }; 33 var config = { rules: rules, 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, 'scope': 'regular'}, 43 {'value': config, 'scope': 'regular'},
44 chrome.test.callbackPass()); 44 chrome.test.callbackPass());
45 }, 45 },
46 function clearProxies() { 46 function clearProxies() {
47 chrome.experimental.proxy.settings.clear( 47 chrome.proxy.settings.clear(
48 {'scope': 'regular'}, 48 {'scope': 'regular'},
49 chrome.test.callbackPass()); 49 chrome.test.callbackPass());
50 } 50 }
51 ]); 51 ]);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698