| Index: third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js
|
| index fe3aa7767f793582ceba9ab16dc4a214d98e4d43..6b3177169243bce1d6aa3302b4e550b9104eed7e 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js
|
| +++ b/third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js
|
| @@ -11,9 +11,9 @@ function extensionFunctions()
|
|
|
| var initialize_ExtensionsTest = function()
|
| {
|
| -WebInspector.extensionServer._registerHandler("evaluateForTestInFrontEnd", onEvaluate);
|
| +Extensions.extensionServer._registerHandler("evaluateForTestInFrontEnd", onEvaluate);
|
|
|
| -WebInspector.extensionServer._extensionAPITestHook = function(extensionServerClient, coreAPI)
|
| +Extensions.extensionServer._extensionAPITestHook = function(extensionServerClient, coreAPI)
|
| {
|
| window.webInspector = coreAPI;
|
| window._extensionServerForTests = extensionServerClient;
|
| @@ -22,14 +22,14 @@ WebInspector.extensionServer._extensionAPITestHook = function(extensionServerCli
|
|
|
| InspectorTest._replyToExtension = function(requestId, port)
|
| {
|
| - WebInspector.extensionServer._dispatchCallback(requestId, port);
|
| + Extensions.extensionServer._dispatchCallback(requestId, port);
|
| }
|
|
|
| function onEvaluate(message, port)
|
| {
|
| function reply(param)
|
| {
|
| - WebInspector.extensionServer._dispatchCallback(message.requestId, port, param);
|
| + Extensions.extensionServer._dispatchCallback(message.requestId, port, param);
|
| }
|
|
|
| try {
|
| @@ -43,8 +43,8 @@ function onEvaluate(message, port)
|
| InspectorTest.showPanel = function(panelId)
|
| {
|
| if (panelId === "extension")
|
| - panelId = WebInspector.inspectorView._tabbedPane._tabs[WebInspector.inspectorView._tabbedPane._tabs.length - 1].id;
|
| - return WebInspector.inspectorView.showPanel(panelId);
|
| + panelId = UI.inspectorView._tabbedPane._tabs[UI.inspectorView._tabbedPane._tabs.length - 1].id;
|
| + return UI.inspectorView.showPanel(panelId);
|
| }
|
|
|
| InspectorTest.runExtensionTests = function()
|
| @@ -58,7 +58,7 @@ InspectorTest.runExtensionTests = function()
|
| pageURL.replace(/\/inspector\/extensions\/[^/]*$/, "/http/tests")) +
|
| "/inspector/resources/extension-main.html";
|
| InspectorFrontendAPI.addExtensions([{ startPage: extensionURL, name: "test extension", exposeWebInspectorNamespace: true }]);
|
| - WebInspector.extensionServer.initializeExtensions();
|
| + Extensions.extensionServer.initializeExtensions();
|
| });
|
| }
|
|
|
| @@ -71,6 +71,6 @@ function extension_showPanel(panelId, callback)
|
|
|
| var test = function()
|
| {
|
| - WebInspector.moduleSetting("shortcutPanelSwitch").set(true);
|
| + Common.moduleSetting("shortcutPanelSwitch").set(true);
|
| InspectorTest.runExtensionTests();
|
| }
|
|
|