DevTools: remove extra indirections from how extension API is built

third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js

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 29bcfbe8c9a0a01a61488cd47157e32e5c5899da..cf84c359c2433d19905fdc3c2910e0523c1f009d 100644
--- a/third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js
+++ b/third_party/WebKit/LayoutTests/http/tests/inspector/extensions-test.js
@@ -11,18 +11,13 @@ function extensionFunctions()
 
 var initialize_ExtensionsTest = function()
 {
+WebInspector.extensionServer._registerHandler("evaluateForTestInFrontEnd", onEvaluate);
 
-WebInspector.extensionServer._overridePlatformExtensionAPIForTest = function(extensionInfo, inspectedTabId, themeName)
+WebInspector.extensionServer._extensionAPITestHook = function(extensionServerClient, coreAPI)
 {
-    WebInspector.extensionServer._registerHandler("evaluateForTestInFrontEnd", onEvaluate);
-
-    function platformExtensionAPI(coreAPI)
-    {
-        window.webInspector = coreAPI;
-        window._extensionServerForTests = extensionServer;
-        coreAPI.panels.themeName = "themeNameForTest";
-    }
-    return platformExtensionAPI.toString();
+    window.webInspector = coreAPI;
+    window._extensionServerForTests = extensionServerClient;
+    coreAPI.panels.themeName = "themeNameForTest";
 }
 
 InspectorTest._replyToExtension = function(requestId, port)