Reland 274764 - Reland 274558 - Move some resources to extensions_renderer_resources.grd.

chrome/renderer/resources/extensions/last_error.js

Index: chrome/renderer/resources/extensions/last_error.js
diff --git a/chrome/renderer/resources/extensions/last_error.js b/chrome/renderer/resources/extensions/last_error.js
deleted file mode 100644
index b096aa4e366d6d371a92fbc0ed5a6acd6d2f3dbc..0000000000000000000000000000000000000000
--- a/chrome/renderer/resources/extensions/last_error.js
+++ /dev/null
@@ -1,124 +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 GetAvailability = requireNative('v8_context').GetAvailability;
-var GetGlobal = requireNative('sendRequest').GetGlobal;
-
-// Utility for setting chrome.*.lastError.
-//
-// A utility here is useful for two reasons:
-//  1. For backwards compatibility we need to set chrome.extension.lastError,
-//     but not all contexts actually have access to the extension namespace.
-//  2. When calling across contexts, the global object that gets lastError set
-//     needs to be that of the caller. We force callers to explicitly specify
-//     the chrome object to try to prevent bugs here.
-
-/**
- * Sets the last error for |name| on |targetChrome| to |message| with an
- * optional |stack|.
- */
-function set(name, message, stack, targetChrome) {
-  var errorMessage = name + ': ' + message;
-  if (stack != null && stack != '')
-    errorMessage += '\n' + stack;
-
-  if (!targetChrome)
-    throw new Error('No chrome object to set error: ' + errorMessage);
-  clear(targetChrome);  // in case somebody has set a sneaky getter/setter
-
-  var errorObject = { message: message };
-  if (GetAvailability('extension.lastError').is_available)
-    targetChrome.extension.lastError = errorObject;
-
-  assertRuntimeIsAvailable();
-
-  // We check to see if developers access runtime.lastError in order to decide
-  // whether or not to log it in the (error) console.
-  privates(targetChrome.runtime).accessedLastError = false;
-  $Object.defineProperty(targetChrome.runtime, 'lastError', {
-      configurable: true,
-      get: function() {
-        privates(targetChrome.runtime).accessedLastError = true;
-        return errorObject;
-      },
-      set: function(error) {
-        errorObject = errorObject;
-      }});
-};
-
-/**
- * Check if anyone has checked chrome.runtime.lastError since it was set.
- * @param {Object} targetChrome the Chrome object to check.
- * @return boolean True if the lastError property was set.
- */
-function hasAccessed(targetChrome) {
-  assertRuntimeIsAvailable();
-  return privates(targetChrome.runtime).accessedLastError === true;
-}
-
-/**
- * Check whether there is an error set on |targetChrome| without setting
- * |accessedLastError|.
- * @param {Object} targetChrome the Chrome object to check.
- * @return boolean Whether lastError has been set.
- */
-function hasError(targetChrome) {
-  if (!targetChrome)
-    throw new Error('No target chrome to check');
-
-  assertRuntimeIsAvailable();
-  if ('lastError' in targetChrome.runtime)
-    return true;
-
-  return false;
-};
-
-/**
- * Clears the last error on |targetChrome|.
- */
-function clear(targetChrome) {
-  if (!targetChrome)
-    throw new Error('No target chrome to clear error');
-
-  if (GetAvailability('extension.lastError').is_available)
-   delete targetChrome.extension.lastError;
-
-  assertRuntimeIsAvailable();
-  delete targetChrome.runtime.lastError;
-  delete privates(targetChrome.runtime).accessedLastError;
-};
-
-function assertRuntimeIsAvailable() {
-  // chrome.runtime should always be available, but maybe it's disappeared for
-  // some reason? Add debugging for http://crbug.com/258526.
-  var runtimeAvailability = GetAvailability('runtime.lastError');
-  if (!runtimeAvailability.is_available) {
-    throw new Error('runtime.lastError is not available: ' +
-                    runtimeAvailability.message);
-  }
-  if (!chrome.runtime)
-    throw new Error('runtime namespace is null or undefined');
-}
-
-/**
- * Runs |callback(args)| with last error args as in set().
- *
- * The target chrome object is the global object's of the callback, so this
- * method won't work if the real callback has been wrapped (etc).
- */
-function run(name, message, stack, callback, args) {
-  var targetChrome = GetGlobal(callback).chrome;
-  set(name, message, stack, targetChrome);
-  try {
-    $Function.apply(callback, undefined, args);
-  } finally {
-    clear(targetChrome);
-  }
-}
-
-exports.clear = clear;
-exports.hasAccessed = hasAccessed;
-exports.hasError = hasError;
-exports.set = set;
-exports.run = run;