Add support for using AMD modules from extensions modules.

chrome/renderer/extensions/safe_builtins_unittest.cc

Index: chrome/renderer/extensions/safe_builtins_unittest.cc
diff --git a/chrome/renderer/extensions/safe_builtins_unittest.cc b/chrome/renderer/extensions/safe_builtins_unittest.cc
index acf8194b8b48b1700df4afaf60e49c87fafd4012..5b4f826fa02d174c656cf38757b4df84e1e8fb6f 100644
--- a/chrome/renderer/extensions/safe_builtins_unittest.cc
+++ b/chrome/renderer/extensions/safe_builtins_unittest.cc
@@ -12,55 +12,52 @@ class SafeBuiltinsUnittest : public ModuleSystemTest {
 
 TEST_F(SafeBuiltinsUnittest, TestNotOriginalObject) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(
-      context_->module_system());
-  RegisterModule("test",
-      "var assert = requireNative('assert');\n"
-      "Array.foo = 10;\n"
-      "assert.AssertTrue(!$Array.hasOwnProperty('foo'));\n"
-  );
-  context_->module_system()->Require("test");
+      env()->module_system());
+  env()->RegisterModule("test",
+                        "var assert = requireNative('assert');\n"
+                        "Array.foo = 10;\n"
+                        "assert.AssertTrue(!$Array.hasOwnProperty('foo'));\n");
+  env()->module_system()->Require("test");
 }
 
 TEST_F(SafeBuiltinsUnittest, TestSelf) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(
-      context_->module_system());
-  RegisterModule("test",
-      "var assert = requireNative('assert');\n"
-      "Array.foo = 10;\n"
-      "assert.AssertTrue($Array.self.foo == 10);\n"
-      "var arr = $Array.self(1);\n"
-      "assert.AssertTrue(arr.length == 1);\n"
-      "assert.AssertTrue(arr[0] === undefined);\n"
-  );
-  context_->module_system()->Require("test");
+      env()->module_system());
+  env()->RegisterModule("test",
+                        "var assert = requireNative('assert');\n"
+                        "Array.foo = 10;\n"
+                        "assert.AssertTrue($Array.self.foo == 10);\n"
+                        "var arr = $Array.self(1);\n"
+                        "assert.AssertTrue(arr.length == 1);\n"
+                        "assert.AssertTrue(arr[0] === undefined);\n");
+  env()->module_system()->Require("test");
 }
 
 TEST_F(SafeBuiltinsUnittest, TestStaticFunction) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(
-      context_->module_system());
-  RegisterModule("test",
-      "var assert = requireNative('assert');\n"
-      "Object.keys = function() {throw new Error()};\n"
-      "var obj = {a: 10};\n"
-      "var keys = $Object.keys(obj);\n"
-      "assert.AssertTrue(keys.length == 1);\n"
-      "assert.AssertTrue(keys[0] == 'a');\n"
-  );
-  context_->module_system()->Require("test");
+      env()->module_system());
+  env()->RegisterModule("test",
+                        "var assert = requireNative('assert');\n"
+                        "Object.keys = function() {throw new Error()};\n"
+                        "var obj = {a: 10};\n"
+                        "var keys = $Object.keys(obj);\n"
+                        "assert.AssertTrue(keys.length == 1);\n"
+                        "assert.AssertTrue(keys[0] == 'a');\n");
+  env()->module_system()->Require("test");
 }
 
 TEST_F(SafeBuiltinsUnittest, TestInstanceMethod) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(
-      context_->module_system());
-  RegisterModule("test",
+      env()->module_system());
+  env()->RegisterModule(
+      "test",
       "var assert = requireNative('assert');\n"
       "Array.prototype.push = function() {throw new Error();}\n"
       "var arr = []\n"
       "$Array.push(arr, 1);\n"
       "assert.AssertTrue(arr.length == 1);\n"
-      "assert.AssertTrue(arr[0] == 1);\n"
-  );
-  context_->module_system()->Require("test");
+      "assert.AssertTrue(arr[0] == 1);\n");
+  env()->module_system()->Require("test");
 }
 
 // NOTE: JSON is already tested in ExtensionApiTest.Messaging, via