Revert 126317 and 126306 because of a performance regression on page loading.

BUG=104100
TEST=existing tests

Review URL: http://codereview.chromium.org/9692034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126360 0039d316-1c4b-4281-b951-d872f2087c98

30 files changed, 198 insertions, 112 deletions

diff --git a/chrome/renderer/resources/extensions/apitest.js b/chrome/renderer/resources/extensions/apitest.js
index 6f015ef..ffa0814 100644
--- a/chrome/renderer/resources/extensions/apitest.js
+++ b/chrome/renderer/resources/extensions/apitest.js
@@ -5,6 +5,8 @@
 // extension_apitest.js
 // mini-framework for ExtensionApiTest browser tests
 
+var chrome = chrome || {};
+(function() {
   chrome.test = chrome.test || {};
 
   chrome.test.tests = chrome.test.tests || [];
@@ -273,3 +275,4 @@
     chrome.test.tests = tests;
     chrome.test.runNextTest();
   };
+})();
diff --git a/chrome/renderer/resources/extensions/app.js b/chrome/renderer/resources/extensions/app.js
index 7337d86..698e980 100644
--- a/chrome/renderer/resources/extensions/app.js
+++ b/chrome/renderer/resources/extensions/app.js
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-  var natives = requireNative('app');
-  var GetIsInstalled = natives.GetIsInstalled;
-  var Install = natives.Install;
-  var GetDetails = natives.GetDetails;
-  var GetDetailsForFrame = natives.GetDetailsForFrame;
-  var GetAppNotifyChannel = natives.GetAppNotifyChannel;
+var chrome = chrome || {};
+(function() {
+  native function GetChromeHidden();
+  native function GetIsInstalled();
+  native function Install();
+  native function GetDetails();
+  native function GetDetailsForFrame();
+  native function GetAppNotifyChannel();
 
-  var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+  var chromeHidden = GetChromeHidden();
   var callbacks = {};
   var nextCallbackId = 1;
 
@@ -39,3 +41,4 @@
       delete callbacks[callbackId];
     }
   };
+})();
diff --git a/chrome/renderer/resources/extensions/browser_action_custom_bindings.js b/chrome/renderer/resources/extensions/browser_action_custom_bindings.js
index 137da5b..8b791a7 100644
--- a/chrome/renderer/resources/extensions/browser_action_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/browser_action_custom_bindings.js
@@ -4,9 +4,11 @@
 
 // Custom bindings for the browserAction API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
 
-chromeHidden.registerCustomHook('browserAction', function(bindingsAPI) {
+native function GetChromeHidden();
+
+GetChromeHidden().registerCustomHook('browserAction', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
   var setIcon = bindingsAPI.setIcon;
 
@@ -14,3 +16,5 @@ chromeHidden.registerCustomHook('browserAction', function(bindingsAPI) {
     setIcon(details, this.name, this.definition.parameters, 'browser action');
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/chrome_private_custom_bindings.js b/chrome/renderer/resources/extensions/chrome_private_custom_bindings.js
index b50bbee..c3f712b 100644
--- a/chrome/renderer/resources/extensions/chrome_private_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/chrome_private_custom_bindings.js
@@ -4,15 +4,17 @@
 
 // Custom bindings for the chromePrivate API.
 
-var chromePrivate = requireNative('chrome_private');
-var DecodeJPEG = chromePrivate.DecodeJPEG;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function DecodeJPEG(jpegImage);
 
-chromeHidden.registerCustomHook('chromePrivate', function(bindingsAPI) {
+GetChromeHidden().registerCustomHook('chromePrivate', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
   apiFunctions.setHandleRequest('decodeJPEG', function(jpeg_image) {
     return DecodeJPEG(jpeg_image);
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/content_settings_custom_bindings.js b/chrome/renderer/resources/extensions/content_settings_custom_bindings.js
index bc98a90..14bc91c 100644
--- a/chrome/renderer/resources/extensions/content_settings_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/content_settings_custom_bindings.js
@@ -4,7 +4,11 @@
 
 // Custom bindings for the contentSettings API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
+
+native function GetChromeHidden();
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomType('ContentSetting', function(typesAPI) {
   var sendRequest = typesAPI.sendRequest;
@@ -50,3 +54,5 @@ chromeHidden.registerCustomType('ContentSetting', function(typesAPI) {
 
   return ContentSetting;
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/context_menus_custom_bindings.js b/chrome/renderer/resources/extensions/context_menus_custom_bindings.js
index 546140b..e4983e6 100644
--- a/chrome/renderer/resources/extensions/context_menus_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/context_menus_custom_bindings.js
@@ -4,10 +4,12 @@
 
 // Custom bindings for the contextMenus API.
 
-var contextMenus = requireNative('context_menus');
-var GetNextContextMenuId = contextMenus.GetNextContextMenuId;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetNextContextMenuId();
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomHook('contextMenus', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
@@ -85,3 +87,5 @@ chromeHidden.registerCustomHook('contextMenus', function(bindingsAPI) {
     chromeHidden.contextMenus.handlers = {};
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/devtools_custom_bindings.js b/chrome/renderer/resources/extensions/devtools_custom_bindings.js
index 9d1d8eb..d1ad34c 100644
--- a/chrome/renderer/resources/extensions/devtools_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/devtools_custom_bindings.js
@@ -4,9 +4,11 @@
 
 // Custom bindings for the devtools API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
 
-chromeHidden.registerCustomHook('devtools', function(bindingsAPI) {
+native function GetChromeHidden();
+
+GetChromeHidden().registerCustomHook('devtools', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
   apiFunctions.setHandleRequest('getTabEvents', function(tabId) {
@@ -21,3 +23,5 @@ chromeHidden.registerCustomHook('devtools', function(bindingsAPI) {
     return tabIdProxy;
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/event.js b/chrome/renderer/resources/extensions/event.js
index c8a05cf..2cf78a8 100644
--- a/chrome/renderer/resources/extensions/event.js
+++ b/chrome/renderer/resources/extensions/event.js
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-  var eventBindingsNatives = requireNative('event_bindings');
-  var AttachEvent = eventBindingsNatives.AttachEvent;
-  var DetachEvent = eventBindingsNatives.DetachEvent;
-  var Print = eventBindingsNatives.Print;
+var chrome = chrome || {};
+(function () {
+  native function GetChromeHidden();
+  native function AttachEvent(eventName);
+  native function DetachEvent(eventName, manual);
+  native function Print();
 
-  var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+  var chromeHidden = GetChromeHidden();
 
   // Local implementation of JSON.parse & JSON.stringify that protect us
   // from being clobbered by an extension.
@@ -309,3 +311,4 @@
   chromeHidden.dispatchError = function(msg) {
     console.error(msg);
   };
+})();
diff --git a/chrome/renderer/resources/extensions/experimental.declarative_custom_bindings.js b/chrome/renderer/resources/extensions/experimental.declarative_custom_bindings.js
index 73d4642..de47b6c 100644
--- a/chrome/renderer/resources/extensions/experimental.declarative_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/experimental.declarative_custom_bindings.js
@@ -4,7 +4,11 @@
 
 // Custom bindings for the declarative API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
+
+native function GetChromeHidden();
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomHook('experimental.declarative',
                                 function(bindingsAPI) {
@@ -74,3 +78,5 @@ chromeHidden.registerCustomHook('experimental.declarative',
                 this.definition.parameters);
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/experimental.socket_custom_bindings.js b/chrome/renderer/resources/extensions/experimental.socket_custom_bindings.js
index a5b2568..52a8659 100644
--- a/chrome/renderer/resources/extensions/experimental.socket_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/experimental.socket_custom_bindings.js
@@ -4,10 +4,11 @@
 
 // Custom bindings for the experimental.socket API.
 
-  var experimentalSocketNatives = requireNative('experimental_socket');
-  var GetNextSocketEventId = experimentalSocketNatives.GetNextSocketEventId;
+(function() {
+  native function GetChromeHidden();
+  native function GetNextSocketEventId();
 
-  var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+  var chromeHidden = GetChromeHidden();
 
   chromeHidden.registerCustomHook('experimental.socket', function(api) {
       var apiFunctions = api.apiFunctions;
@@ -55,3 +56,5 @@
           }
         });
     });
+
+})();
diff --git a/chrome/renderer/resources/extensions/extension_custom_bindings.js b/chrome/renderer/resources/extensions/extension_custom_bindings.js
index 970e11f..f746e2a 100644
--- a/chrome/renderer/resources/extensions/extension_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/extension_custom_bindings.js
@@ -4,11 +4,13 @@
 
 // Custom bindings for the extension API.
 
-var extensionNatives = requireNative('extension');
-var GetExtensionViews = extensionNatives.GetExtensionViews;
-var OpenChannelToExtension = extensionNatives.OpenChannelToExtension;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetExtensionViews();
+native function OpenChannelToExtension(sourceId, targetId, name);
+
+var chromeHidden = GetChromeHidden();
 
 // This should match chrome.windows.WINDOW_ID_NONE.
 //
@@ -142,3 +144,5 @@ chromeHidden.registerCustomHook('extension',
     throw new Error('Error connecting to extension ' + targetId);
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/file_browser_handler_custom_bindings.js b/chrome/renderer/resources/extensions/file_browser_handler_custom_bindings.js
index 44d1539..9fb152c 100644
--- a/chrome/renderer/resources/extensions/file_browser_handler_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/file_browser_handler_custom_bindings.js
@@ -4,11 +4,12 @@
 
 // Custom bindings for the fileBrowserHandler API.
 
-var fileBrowserNatives = requireNative('file_browser_handler');
-var GetExternalFileEntry = fileBrowserNatives.GetExternalFileEntry;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetExternalFileEntry();
 
+var chromeHidden = GetChromeHidden();
 chromeHidden.Event.registerArgumentMassager('fileBrowserHandler.onExecute',
     function(args) {
   if (args.length < 2)
@@ -22,3 +23,5 @@ chromeHidden.Event.registerArgumentMassager('fileBrowserHandler.onExecute',
   for (var i = 0; i < fileList.length; i++)
     fileList[i] = GetExternalFileEntry(fileList[i]);
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js b/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js
index 2423cfb..7b483b5 100644
--- a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js
@@ -4,10 +4,12 @@
 
 // Custom bindings for the fileBrowserPrivate API.
 
-var fileBrowserPrivateNatives = requireNative('file_browser_private');
-var GetLocalFileSystem = fileBrowserPrivateNatives.GetLocalFileSystem;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetLocalFileSystem(name, path);
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomHook('fileBrowserPrivate', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
@@ -23,3 +25,5 @@ chromeHidden.registerCustomHook('fileBrowserPrivate', function(bindingsAPI) {
     request.callback = null;
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/i18n_custom_bindings.js b/chrome/renderer/resources/extensions/i18n_custom_bindings.js
index a9fa5a2..8f9ca30 100644
--- a/chrome/renderer/resources/extensions/i18n_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/i18n_custom_bindings.js
@@ -4,12 +4,12 @@
 
 // Custom bindings for the i18n API.
 
-var i18nNatives = requireNative('i18n');
-var GetL10nMessage = i18nNatives.GetL10nMessage;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetL10nMessage();
 
-chromeHidden.registerCustomHook('i18n',
+GetChromeHidden().registerCustomHook('i18n',
                                      function(bindingsAPI, extensionId) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
@@ -18,3 +18,5 @@ chromeHidden.registerCustomHook('i18n',
     return GetL10nMessage(messageName, substitutions, extensionId);
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/input.ime_custom_bindings.js b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
index 8f400c7..c6bbbfc 100644
--- a/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
@@ -5,9 +5,11 @@
 // Custom bindings for the input ime API. Only injected into the
 // v8 contexts for extensions which have permission for the API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
 
-chromeHidden.registerCustomHook('input.ime', function() {
+native function GetChromeHidden();
+
+GetChromeHidden().registerCustomHook('input.ime', function() {
   chrome.input.ime.onKeyEvent.dispatch = function(engineID, keyData) {
     var args = Array.prototype.slice.call(arguments);
     if (this.validate_) {
@@ -34,3 +36,5 @@ chromeHidden.registerCustomHook('input.ime', function() {
     }
   };
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/json_schema.js b/chrome/renderer/resources/extensions/json_schema.js
index bc51d97..f1fdf9e 100644
--- a/chrome/renderer/resources/extensions/json_schema.js
+++ b/chrome/renderer/resources/extensions/json_schema.js
@@ -38,7 +38,9 @@
 //   additional properties will be validated.
 //==============================================================================
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
+native function GetChromeHidden();
+var chromeHidden = GetChromeHidden();
 
 function isInstanceOfClass(instance, className) {
   if (!instance)
@@ -496,3 +498,5 @@ chromeHidden.JSONSchemaValidator.prototype.addError =
 chromeHidden.JSONSchemaValidator.prototype.resetErrors = function() {
   this.errors = [];
 };
+
+})();
diff --git a/chrome/renderer/resources/extensions/miscellaneous_bindings.js b/chrome/renderer/resources/extensions/miscellaneous_bindings.js
index a2d284d..6bcfc11 100644
--- a/chrome/renderer/resources/extensions/miscellaneous_bindings.js
+++ b/chrome/renderer/resources/extensions/miscellaneous_bindings.js
@@ -7,15 +7,16 @@
 // scripts or background pages.
 // See user_script_slave.cc for script that is loaded by content scripts only.
 
-  require('json_schema');
-  require('event_bindings');
-  var miscNatives = requireNative('miscellaneous_bindings');
-  var CloseChannel = miscNatives.CloseChannel;
-  var PortAddRef = miscNatives.PortAddRef;
-  var PortRelease = miscNatives.PortRelease;
-  var PostMessage = miscNatives.PostMessage;
-
-  var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+var chrome = chrome || {};
+(function () {
+  native function CloseChannel(portId, notifyBrowser);
+  native function PortAddRef(portId);
+  native function PortRelease(portId);
+  native function PostMessage(portId, msg);
+  native function GetChromeHidden();
+  native function Print();
+
+  var chromeHidden = GetChromeHidden();
   var manifestVersion;
   var extensionId;
 
@@ -209,3 +210,4 @@
 
     chrome.extension.inIncognitoContext = inIncognitoContext;
   });
+})();
diff --git a/chrome/renderer/resources/extensions/omnibox_custom_bindings.js b/chrome/renderer/resources/extensions/omnibox_custom_bindings.js
index 37f8d92..13a3c61 100644
--- a/chrome/renderer/resources/extensions/omnibox_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/omnibox_custom_bindings.js
@@ -5,7 +5,9 @@
 // Custom bindings for the omnibox API. Only injected into the v8 contexts
 // for extensions which have permission for the omnibox API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
+
+native function GetChromeHidden();
 
 // Remove invalid characters from |text| so that it is suitable to use
 // for |AutocompleteMatch::contents|.
@@ -77,7 +79,7 @@ function parseOmniboxDescription(input) {
   return result;
 }
 
-chromeHidden.registerCustomHook('omnibox', function(bindingsAPI) {
+GetChromeHidden().registerCustomHook('omnibox', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
   var sendRequest = bindingsAPI.sendRequest;
 
@@ -106,3 +108,5 @@ chromeHidden.registerCustomHook('omnibox', function(bindingsAPI) {
     chrome.Event.prototype.dispatch.apply(this, [text, suggestCallback]);
   };
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/page_action_custom_bindings.js b/chrome/renderer/resources/extensions/page_action_custom_bindings.js
index 13336b1d..722a57b 100644
--- a/chrome/renderer/resources/extensions/page_action_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/page_action_custom_bindings.js
@@ -4,9 +4,11 @@
 
 // Custom bindings for the pageAction API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
 
-chromeHidden.registerCustomHook('pageAction', function(bindingsAPI) {
+native function GetChromeHidden();
+
+GetChromeHidden().registerCustomHook('pageAction', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
   var setIcon = bindingsAPI.setIcon;
 
@@ -14,3 +16,5 @@ chromeHidden.registerCustomHook('pageAction', function(bindingsAPI) {
     setIcon(details, this.name, this.definition.parameters, 'page action');
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/page_actions_custom_bindings.js b/chrome/renderer/resources/extensions/page_actions_custom_bindings.js
index d5ec888..2a7a2de 100644
--- a/chrome/renderer/resources/extensions/page_actions_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/page_actions_custom_bindings.js
@@ -4,13 +4,13 @@
 
 // Custom bindings for the pageActions API.
 
-var pageActionsNatives = requireNative('page_actions');
-var GetCurrentPageActions = pageActionsNatives.GetCurrentPageActions;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetCurrentPageActions();
 
-chromeHidden.registerCustomHook('pageActions',
-                                function(bindingsAPI, extensionId) {
+GetChromeHidden().registerCustomHook('pageActions',
+                                     function(bindingsAPI, extensionId) {
   var pageActions = GetCurrentPageActions(extensionId);
   var oldStyleEventName = 'pageActions';
   for (var i = 0; i < pageActions.length; ++i) {
@@ -18,3 +18,5 @@ chromeHidden.registerCustomHook('pageActions',
     chrome.pageActions[pageActions[i]] = new chrome.Event(oldStyleEventName);
   }
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/page_capture_custom_bindings.js b/chrome/renderer/resources/extensions/page_capture_custom_bindings.js
index 0bcbb0b..e8a7af4 100644
--- a/chrome/renderer/resources/extensions/page_capture_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/page_capture_custom_bindings.js
@@ -4,11 +4,13 @@
 
 // Custom bindings for the pageCapture API.
 
-var pageCaptureNatives = requireNative('page_capture');
-var CreateBlob = pageCaptureNatives.CreateBlob;
-var SendResponseAck = pageCaptureNatives.SendResponseAck;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function CreateBlob(filePath);
+native function SendResponseAck(requestId);
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomHook('pageCapture', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
@@ -28,3 +30,5 @@ chromeHidden.registerCustomHook('pageCapture', function(bindingsAPI) {
     SendResponseAck(request.id);
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/schema_generated_bindings.js b/chrome/renderer/resources/extensions/schema_generated_bindings.js
index ab11923..bc057d2 100644
--- a/chrome/renderer/resources/extensions/schema_generated_bindings.js
+++ b/chrome/renderer/resources/extensions/schema_generated_bindings.js
@@ -5,15 +5,15 @@
 // This script contains privileged chrome extension related javascript APIs.
 // It is loaded by pages whose URL has the chrome-extension protocol.
 
-  require('json_schema');
-  require('event_bindings');
-  var natives = requireNative('schema_generated_bindings');
-  var GetExtensionAPIDefinition = natives.GetExtensionAPIDefinition;
-  var GetNextRequestId = natives.GetNextRequestId;
-  var StartRequest = natives.StartRequest;
-  var SetIconCommon = natives.SetIconCommon;
+var chrome = chrome || {};
+(function() {
+  native function GetChromeHidden();
+  native function GetExtensionAPIDefinition();
+  native function GetNextRequestId();
+  native function StartRequest();
+  native function SetIconCommon();
 
-  var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+  var chromeHidden = GetChromeHidden();
 
   // The object to generate the bindings for "internal" APIs in, so that
   // extensions can't directly call them (without access to chromeHidden),
@@ -753,3 +753,4 @@
     if (chrome.test)
       chrome.test.getApiDefinitions = GetExtensionAPIDefinition;
   });
+})();
diff --git a/chrome/renderer/resources/extensions/setup_bindings.js b/chrome/renderer/resources/extensions/setup_bindings.js
deleted file mode 100644
index 86b0cd5..0000000
--- a/chrome/renderer/resources/extensions/setup_bindings.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-var contextInfo = requireNative('context_info');
-var sgb = requireNative('schema_generated_bindings');
-
-require('app');
-require('webstore');
-
-if (contextInfo.IsBindingsAllowed()) {
-  require('miscellaneous_bindings');
-  require('schema_generated_bindings');
-  require('apitest');
-
-  // Load the custom bindings for each API.
-  sgb.GetExtensionAPIDefinition().forEach(function(apiDef) {
-    if (contextInfo.IsAPIAllowed(apiDef.namespace))
-      require(apiDef.namespace);
-  });
-}
diff --git a/chrome/renderer/resources/extensions/storage_custom_bindings.js b/chrome/renderer/resources/extensions/storage_custom_bindings.js
index a3c8a54..1d358c2 100644
--- a/chrome/renderer/resources/extensions/storage_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/storage_custom_bindings.js
@@ -4,7 +4,11 @@
 
 // Custom bindings for the storage API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
+
+native function GetChromeHidden();
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomType('StorageArea', function(typesAPI) {
   var sendRequest = typesAPI.sendRequest;
@@ -39,3 +43,5 @@ chromeHidden.registerCustomType('StorageArea', function(typesAPI) {
 
   return StorageArea;
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/tabs_custom_bindings.js b/chrome/renderer/resources/extensions/tabs_custom_bindings.js
index e0cc59c..dd66481 100644
--- a/chrome/renderer/resources/extensions/tabs_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/tabs_custom_bindings.js
@@ -4,10 +4,12 @@
 
 // Custom bindings for the tabs API.
 
-var tabsNatives = requireNative('tabs');
-var OpenChannelToTab = tabsNatives.OpenChannelToTab;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function OpenChannelToTab();
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomHook('tabs', function(bindingsAPI, extensionId) {
   var apiFunctions = bindingsAPI.apiFunctions;
@@ -42,3 +44,5 @@ chromeHidden.registerCustomHook('tabs', function(bindingsAPI, extensionId) {
     });
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/tts_custom_bindings.js b/chrome/renderer/resources/extensions/tts_custom_bindings.js
index dee01d3..ef8011a 100644
--- a/chrome/renderer/resources/extensions/tts_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/tts_custom_bindings.js
@@ -4,10 +4,12 @@
 
 // Custom bindings for the tts API.
 
-var ttsNatives = requireNative('tts');
-var GetNextTTSEventId = ttsNatives.GetNextTTSEventId;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetNextTTSEventId();
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomHook('tts', function(api) {
   var apiFunctions = api.apiFunctions;
@@ -40,3 +42,5 @@ chromeHidden.registerCustomHook('tts', function(api) {
     return id;
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/tts_engine_custom_bindings.js b/chrome/renderer/resources/extensions/tts_engine_custom_bindings.js
index 7c0067b..85e36b0 100644
--- a/chrome/renderer/resources/extensions/tts_engine_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/tts_engine_custom_bindings.js
@@ -4,9 +4,11 @@
 
 // Custom bindings for the ttsEngine API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
 
-chromeHidden.registerCustomHook('ttsEngine', function() {
+native function GetChromeHidden();
+
+GetChromeHidden().registerCustomHook('ttsEngine', function() {
   chrome.ttsEngine.onSpeak.dispatch = function(text, options, requestId) {
     var sendTtsEvent = function(event) {
       chrome.ttsEngine.sendTtsEvent(requestId, event);
@@ -15,3 +17,5 @@ chromeHidden.registerCustomHook('ttsEngine', function() {
         this, [text, options, sendTtsEvent]);
   };
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/types_custom_bindings.js b/chrome/renderer/resources/extensions/types_custom_bindings.js
index 48eba8a..62dbe0a 100644
--- a/chrome/renderer/resources/extensions/types_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/types_custom_bindings.js
@@ -4,7 +4,11 @@
 
 // Custom bindings for the types API.
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+(function() {
+
+native function GetChromeHidden();
+
+var chromeHidden = GetChromeHidden();
 
 chromeHidden.registerCustomType('ChromeSetting', function(typesAPI) {
   var sendRequest = typesAPI.sendRequest;
@@ -44,3 +48,5 @@ chromeHidden.registerCustomType('ChromeSetting', function(typesAPI) {
 
   return ChromeSetting;
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/web_request_custom_bindings.js b/chrome/renderer/resources/extensions/web_request_custom_bindings.js
index 392f66c..564251e 100644
--- a/chrome/renderer/resources/extensions/web_request_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/web_request_custom_bindings.js
@@ -4,10 +4,12 @@
 
 // Custom bindings for the webRequest API.
 
-var webRequestNatives = requireNative('web_request');
-var GetUniqueSubEventName = webRequestNatives.GetUniqueSubEventName;
+(function() {
 
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+native function GetChromeHidden();
+native function GetUniqueSubEventName(eventName);
+
+var chromeHidden = GetChromeHidden();
 
 // WebRequestEvent object. This is used for special webRequest events with
 // extra parameters. Each invocation of addListener creates a new named
@@ -170,3 +172,5 @@ chromeHidden.registerCustomHook('webRequest', function(api) {
                 {forIOThread: true});
   });
 });
+
+})();
diff --git a/chrome/renderer/resources/extensions/webstore.js b/chrome/renderer/resources/extensions/webstore.js
index 14bacc5..b387c46 100644
--- a/chrome/renderer/resources/extensions/webstore.js
+++ b/chrome/renderer/resources/extensions/webstore.js
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-  var webstoreNatives = requireNative('webstore');
-  var Install = webstoreNatives.Install;
+var chrome = chrome || {};
+(function() {
+  native function GetChromeHidden();
+  native function Install(preferredStoreUrl, onSuccess, onFailure);
 
-  var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
+  var chromeHidden = GetChromeHidden();
   var pendingInstalls = {};
   chrome.webstore = new function() {
     this.install = function(
@@ -39,3 +41,4 @@
       delete pendingInstall[installId];
     }
   }
+})();