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

Side by Side Diff: chrome/test/data/extensions/api_test/proxy/pac/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.ProxyPacScript 6 // browser_tests.exe --gtest_filter=ProxySettingsApiTest.ProxyPacScript
7 7
8 chrome.test.runTests([ 8 chrome.test.runTests([
9 // Verify that execution has started to make sure flaky timeouts are not 9 // Verify that execution has started to make sure flaky timeouts are not
10 // caused by us. 10 // caused by us.
11 function verifyTestsHaveStarted() { 11 function verifyTestsHaveStarted() {
12 chrome.test.succeed(); 12 chrome.test.succeed();
13 }, 13 },
14 function setAutoSettings() { 14 function setAutoSettings() {
15 var pacScriptObject = { 15 var pacScriptObject = {
16 url: "http://wpad/windows.pac" 16 url: "http://wpad/windows.pac"
17 }; 17 };
18 var config = { 18 var config = {
19 mode: "pac_script", 19 mode: "pac_script",
20 pacScript: pacScriptObject 20 pacScript: pacScriptObject
21 }; 21 };
22 chrome.experimental.proxy.settings.set( 22 chrome.proxy.settings.set(
23 {'value': config}, 23 {'value': config},
24 chrome.test.callbackPass()); 24 chrome.test.callbackPass());
25 } 25 }
26 ]); 26 ]);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698