Add support for using AMD modules from extensions modules.

chrome/renderer/extensions/utils_unittest.cc

Index: chrome/renderer/extensions/utils_unittest.cc
diff --git a/chrome/renderer/extensions/utils_unittest.cc b/chrome/renderer/extensions/utils_unittest.cc
index 3a718ddccd14a4477469f25e7566a2054f5a8f7c..1bd19a0aacd29ad275f6d6d4d5f108a54770ea82 100644
--- a/chrome/renderer/extensions/utils_unittest.cc
+++ b/chrome/renderer/extensions/utils_unittest.cc
@@ -12,26 +12,26 @@ namespace {
 class UtilsUnittest : public ModuleSystemTest {
  protected:
   void RegisterTestModule(const char* code) {
-    RegisterModule("test",
-                   base::StringPrintf(
-                       "var assert = requireNative('assert');\n"
-                       "var AssertTrue = assert.AssertTrue;\n"
-                       "var AssertFalse = assert.AssertFalse;\n"
-                       "var utils = require('utils');\n"
-                       "%s",
-                       code));
+    env_.RegisterModule("test",
+                        base::StringPrintf(
+                            "var assert = requireNative('assert');\n"
+                            "var AssertTrue = assert.AssertTrue;\n"
+                            "var AssertFalse = assert.AssertFalse;\n"
+                            "var utils = require('utils');\n"
+                            "%s",
+                            code));
   }
 
  private:
   virtual void SetUp() OVERRIDE {
     ModuleSystemTest::SetUp();
 
-    RegisterModule("utils", IDR_UTILS_JS);
-    OverrideNativeHandler("schema_registry",
-                          "exports.GetSchema = function() {};");
-    OverrideNativeHandler("logging",
-                          "exports.CHECK = function() {};\n"
-                          "exports.WARNING = function() {};");
+    env_.RegisterModule("utils", IDR_UTILS_JS);
+    env_.OverrideNativeHandler("schema_registry",
+                               "exports.GetSchema = function() {};");
+    env_.OverrideNativeHandler("logging",
+                               "exports.CHECK = function() {};\n"
+                               "exports.WARNING = function() {};");
   }
 };
 
@@ -40,8 +40,7 @@ TEST_F(UtilsUnittest, TestNothing) {
 }
 
 TEST_F(UtilsUnittest, SuperClass) {
-  ModuleSystem::NativesEnabledScope natives_enabled_scope(
-      context_->module_system());
+  ModuleSystem::NativesEnabledScope natives_enabled_scope(env_.module_system());
   RegisterTestModule(
       "function SuperClassImpl() {}\n"
       "\n"
@@ -116,7 +115,7 @@ TEST_F(UtilsUnittest, SuperClass) {
       "AssertTrue(subsub instanceof SubClass);\n"
       "AssertTrue(subsub instanceof SubSubClass);\n");
 
-  context_->module_system()->Require("test");
+  env_.module_system()->Require("test");
 }
 
 }  // namespace