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

Side by Side Diff: chrome/test/data/extensions/api_test/proxy/pacdata/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.ProxyPacData 6 // browser_tests.exe --gtest_filter=ProxySettingsApiTest.ProxyPacData
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 13 matching lines...) Expand all
24 pacScript: pacScriptObject 24 pacScript: pacScriptObject
25 }; 25 };
26 26
27 chrome.test.runTests([ 27 chrome.test.runTests([
28 // Verify that execution has started to make sure flaky timeouts are not 28 // Verify that execution has started to make sure flaky timeouts are not
29 // caused by us. 29 // caused by us.
30 function verifyTestsHaveStarted() { 30 function verifyTestsHaveStarted() {
31 chrome.test.succeed(); 31 chrome.test.succeed();
32 }, 32 },
33 function setAutoSettings() { 33 function setAutoSettings() {
34 chrome.experimental.proxy.settings.set( 34 chrome.proxy.settings.set(
35 {'value': config}, 35 {'value': config},
36 chrome.test.callbackPass()); 36 chrome.test.callbackPass());
37 }, 37 },
38 function verifySettings() { 38 function verifySettings() {
39 chrome.experimental.proxy.settings.get( 39 chrome.proxy.settings.get(
40 {'incognito': false}, 40 {'incognito': false},
41 expect({ 'value': config, 41 expect({ 'value': config,
42 'levelOfControl': "ControlledByThisExtension" }, 42 'levelOfControl': "ControlledByThisExtension" },
43 "invalid proxy settings")); 43 "invalid proxy settings"));
44 } 44 }
45 ]); 45 ]);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698