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

Side by Side Diff: chrome/test/data/extensions/api_test/proxy/system/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
« no previous file with comments | « chrome/test/data/extensions/api_test/proxy/system/manifest.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.ProxySystem 6 // browser_tests.exe --gtest_filter=ProxySettingsApiTest.ProxySystem
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 setSystemProxy() { 14 function setSystemProxy() {
15 var config = { mode: "system" }; 15 var config = { mode: "system" };
16 chrome.experimental.proxy.settings.set( 16 chrome.proxy.settings.set(
17 {'value': config}, 17 {'value': config},
18 chrome.test.callbackPass()); 18 chrome.test.callbackPass());
19 } 19 }
20 ]); 20 ]);
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/api_test/proxy/system/manifest.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698