Add support for AMD to the extensions module system.

chrome/test/base/module_system_test.cc

Index: chrome/test/base/module_system_test.cc
diff --git a/chrome/test/base/module_system_test.cc b/chrome/test/base/module_system_test.cc
index bfc8308f1576ae9b8592e06962814397009e7e63..2f04a37329b52f68f05c5d3a83213d43eefb69ce 100644
--- a/chrome/test/base/module_system_test.cc
+++ b/chrome/test/base/module_system_test.cc
@@ -121,18 +121,19 @@ class ModuleSystemTest::StringSourceMap : public ModuleSystem::SourceMap {
 };
 
 ModuleSystemTest::ModuleSystemTest()
-    : isolate_(v8::Isolate::GetCurrent()),
-      handle_scope_(isolate_),
-      context_(
-          new extensions::ChromeV8Context(
-              v8::Context::New(
-                  isolate_,
-                  g_v8_extension_configurator.Get().GetConfiguration()),
-              NULL,  // WebFrame
-              NULL,  // Extension
-              extensions::Feature::UNSPECIFIED_CONTEXT)),
+    : isolate_holder_(v8::Isolate::GetCurrent(), NULL),
+      context_holder_(isolate_holder_.isolate()),
+      handle_scope_(isolate_holder_.isolate()),
       source_map_(new StringSourceMap()),
       should_assertions_be_made_(true) {
+  context_holder_.SetContext(
+      v8::Context::New(isolate_holder_.isolate(),
+                       g_v8_extension_configurator.Get().GetConfiguration()));
+  context_.reset(new extensions::ChromeV8Context(
+      context_holder_.context(),
+      NULL,  // WebFrame
+      NULL,  // Extension
+      extensions::Feature::UNSPECIFIED_CONTEXT));
   context_->v8_context()->Enter();
   assert_natives_ = new AssertNatives(context_.get());
 
@@ -146,8 +147,10 @@ ModuleSystemTest::ModuleSystemTest()
       assert_natives_));
   module_system->RegisterNativeHandler("logging", scoped_ptr<NativeHandler>(
       new extensions::LoggingNativeHandler(context_.get())));
-  module_system->RegisterNativeHandler("utils", scoped_ptr<NativeHandler>(
-      new extensions::UtilsNativeHandler(context_.get())));
+  module_system->RegisterNativeHandler(
+      "utils_natives",
+      scoped_ptr<NativeHandler>(
+          new extensions::UtilsNativeHandler(context_.get())));
   module_system->SetExceptionHandlerForTest(
       scoped_ptr<ModuleSystem::ExceptionHandler>(new FailsOnException));
 }