Revert 186643 - Caused a 10% regression on SunSpider benchmark

chrome/renderer/resources/extensions/file_system_custom_bindings.js

 // 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.
 
-// Custom binding for the fileSystem API.
+// Custom bindings for the fileSystem API.
 
-var binding = require('binding').Binding.create('fileSystem');
-
+var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 var fileSystemNatives = requireNative('file_system_natives');
 var GetIsolatedFileSystem = fileSystemNatives.GetIsolatedFileSystem;
 var lastError = require('lastError');
 var entryIdManager = require('entryIdManager');
 
-binding.registerCustomHook(function(bindingsAPI) {
+chromeHidden.registerCustomHook('fileSystem', function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
-  var fileSystem = bindingsAPI.compiledApi;
-
   function bindFileEntryFunction(functionName) {
     apiFunctions.setUpdateArgumentsPostValidate(
         functionName, function(fileEntry, callback) {
       var fileSystemName = fileEntry.filesystem.name;
       var relativePath = fileEntry.fullPath.slice(1);
       return [fileSystemName, relativePath, callback];
     });
   }
   ['getDisplayPath', 'getWritableEntry', 'isWritableEntry']
       .forEach(bindFileEntryFunction);
@@ skipping 12 matching lines @@
         var fs = GetIsolatedFileSystem(fileSystemId);
 
         try {
           // TODO(koz): fs.root.getFile() makes a trip to the browser process,
           // but it might be possible avoid that by calling
           // WebFrame::createFileEntry().
           fs.root.getFile(baseName, {}, function(fileEntry) {
             entryIdManager.registerEntry(id, fileEntry);
             callback(fileEntry);
           }, function(fileError) {
-            lastError.run('Error getting fileEntry, code: ' + fileError.code,
-                          callback);
+            lastError.set('Error getting fileEntry, code: ' + fileError.code);
+            callback();
           });
         } catch (e) {
-          lastError.run('Error in event handler for onLaunched: ' + e.stack,
-                        callback);
+          lastError.set('Error in event handler for onLaunched: ' + e.stack);
+          callback();
         }
       }
     });
   }
   ['getWritableEntry', 'chooseEntry'].forEach(bindFileEntryCallback);
 
   apiFunctions.setHandleRequest('getEntryId', function(fileEntry) {
     return entryIdManager.getEntryId(fileEntry);
   });
 
   apiFunctions.setHandleRequest('getEntryById', function(id) {
     return entryIdManager.getEntryById(id);
   });
 
   // TODO(benwells): Remove these deprecated versions of the functions.
-  fileSystem.getWritableFileEntry = function() {
+  chrome.fileSystem.getWritableFileEntry = function() {
     console.log("chrome.fileSystem.getWritableFileEntry is deprecated");
     console.log("Please use chrome.fileSystem.getWritableEntry instead");
-    fileSystem.getWritableEntry.apply(this, arguments);
+    chrome.fileSystem.getWritableEntry.apply(this, arguments);
   };
 
-  fileSystem.isWritableFileEntry = function() {
+  chrome.fileSystem.isWritableFileEntry = function() {
     console.log("chrome.fileSystem.isWritableFileEntry is deprecated");
     console.log("Please use chrome.fileSystem.isWritableEntry instead");
-    fileSystem.isWritableEntry.apply(this, arguments);
+    chrome.fileSystem.isWritableEntry.apply(this, arguments);
   };
 
-  fileSystem.chooseFile = function() {
+  chrome.fileSystem.chooseFile = function() {
     console.log("chrome.fileSystem.chooseFile is deprecated");
     console.log("Please use chrome.fileSystem.chooseEntry instead");
-    fileSystem.chooseEntry.apply(this, arguments);
+    chrome.fileSystem.chooseEntry.apply(this, arguments);
   };
 });
-
-exports.binding = binding.generate();