chrome/test/data/extensions/api_test/proxy/pacdata/test.js - Issue 6992022: Move Proxy Settings API out of experimental

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/test/data/extensions/api_test/proxy/pacdata/test.js

diff --git a/chrome/test/data/extensions/api_test/proxy/pacdata/test.js b/chrome/test/data/extensions/api_test/proxy/pacdata/test.js

index e9fab71e41bb84ee9b924aeda1318d94ee251d1c..fb659118cf94fb9be3c20cad6dd1b894fae0dc17 100644

--- a/chrome/test/data/extensions/api_test/proxy/pacdata/test.js

+++ b/chrome/test/data/extensions/api_test/proxy/pacdata/test.js

@@ -31,12 +31,12 @@ chrome.test.runTests([

chrome.test.succeed();

function setAutoSettings() {

- chrome.experimental.proxy.settings.set(

+ chrome.proxy.settings.set(

{'value': config},

chrome.test.callbackPass());

function verifySettings() {

- chrome.experimental.proxy.settings.get(

+ chrome.proxy.settings.get(

{'incognito': false},

expect({ 'value': config,

'levelOfControl': "ControlledByThisExtension" },