[Extensions Bindings] Don't load lastError module with native bindings

extensions/renderer/resources/file_entry_binding_util.js

 // Copyright 2014 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 fileSystemNatives = requireNative('file_system_natives');
 var GetIsolatedFileSystem = fileSystemNatives.GetIsolatedFileSystem;
-var lastError = require('lastError');
 var GetModuleSystem = requireNative('v8_context').GetModuleSystem;
 // TODO(sammc): Don't require extension. See http://crbug.com/235689.
 var GetExtensionViews = requireNative('runtime').GetExtensionViews;
 var safeCallbackApply = require('uncaught_exception_handler').safeCallbackApply;
 
+var jsLastError = bindingUtil ? undefined : require('lastError');
+function runCallbackWithLastError(name, message, stack, callback) {
+  if (bindingUtil)
+    bindingUtil.runCallbackWithLastError(message, callback);
+  else
+    jsLastError.run(name, message, stack, callback);
+}
+
+
 var WINDOW = {};
 try {
   WINDOW = window;
 } catch (e) {
   // Running in SW context.
   // TODO(lazyboy): Synchronous access to background page is not possible from
   // service worker context. Decide what we should do in this case for the class
   // of APIs that require access to background page or window object
 }
 
@@ skipping 21 matching lines @@
             callback();
             return;
           }
 
           var entries = [];
           var hasError = false;
 
           var getEntryError = function(fileError) {
             if (!hasError) {
               hasError = true;
-              lastError.run(
+              runCallbackWithLastError(
                   apiName + '.' + functionName,
                   'Error getting fileEntry, code: ' + fileError.code,
                   request.stack,
                   callback);
             }
           }
 
           // Loop through the response entries and asynchronously get the
           // FileEntry for each. We use hasError to ensure that only the first
           // error is reported. Note that an error can occur either during the
@@ skipping 31 matching lines @@
               // WebDOMFileSystem::createV8Entry().
               if (entry.isDirectory) {
                 fs.root.getDirectory(baseName, {}, getEntryCallback,
                                      getEntryError);
               } else {
                 fs.root.getFile(baseName, {}, getEntryCallback, getEntryError);
               }
             } catch (e) {
               if (!hasError) {
                 hasError = true;
-                lastError.run(apiName + '.' + functionName,
-                              'Error getting fileEntry: ' + e.stack,
-                              request.stack,
-                              callback);
+                runCallbackWithLastError(apiName + '.' + functionName,
+                                         'Error getting fileEntry: ' + e.stack,
+                                         request.stack, callback);
               }
             }
           });
         }
       });
     };
     var entryIdManager = require('entryIdManager');
   } else {
     // Force the fileSystem API to be loaded in the background page. Using
     // backgroundPageModuleSystem.require('fileSystem') is insufficient as
@@ skipping 23 matching lines @@
         if (!response) {
           callback();
           return;
         }
         var fileSystemId = response.fileSystemId;
         var baseName = response.baseName;
         var fs = GetIsolatedFileSystem(fileSystemId);
 
         try {
           fs.root.getDirectory(baseName, {}, callback, function(fileError) {
-            lastError.run('runtime.' + functionName,
-                          'Error getting Entry, code: ' + fileError.code,
-                          request.stack,
-                          callback);
+            runCallbackWithLastError(
+                'runtime.' + functionName,
+                'Error getting Entry, code: ' + fileError.code,
+                request.stack, callback);
           });
         } catch (e) {
-          lastError.run('runtime.' + functionName,
-                        'Error: ' + e.stack,
-                        request.stack,
-                        callback);
+          runCallbackWithLastError('runtime.' + functionName,
+                                   'Error: ' + e.stack,
+                                   request.stack, callback);
         }
       }
     }
   } else {
     var backgroundPageModuleSystem = GetModuleSystem(backgroundPage);
     // Force the runtime API to be loaded in the background page. Using
     // backgroundPageModuleSystem.require('runtime') is insufficient as
     // requireNative is only allowed while lazily loading an API.
     backgroundPage.chrome.runtime;
     return backgroundPageModuleSystem.require('fileEntryBindingUtil')
                .getBindDirectoryEntryCallback();
   }
 }
 
 exports.$set('getFileBindingsForApi', getFileBindingsForApi);
 exports.$set('getBindDirectoryEntryCallback', getBindDirectoryEntryCallback);