Lazy load chrome.* APIs

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 9eef4dae9b05c3522e3f264a1f5494f6a2657bae..ba786745078201fb9b6f8b1080d269da6a43d899 100644
--- a/chrome/test/base/module_system_test.cc
+++ b/chrome/test/base/module_system_test.cc
@@ -7,20 +7,23 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
-#include "chrome/renderer/extensions/native_handler.h"
+#include "chrome/common/extensions/features/feature.h"
+#include "chrome/renderer/extensions/object_backed_native_handler.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #include <map>
 #include <string>
 
+using extensions::ChromeV8Context;
 using extensions::ModuleSystem;
 using extensions::NativeHandler;
+using extensions::ObjectBackedNativeHandler;
 
 // Native JS functions for doing asserts.
-class AssertNatives : public NativeHandler {
+class AssertNatives : public ObjectBackedNativeHandler {
  public:
   explicit AssertNatives(v8::Isolate* isolate)
-      : NativeHandler(isolate),
+      : ObjectBackedNativeHandler(isolate),
         assertion_made_(false),
         failed_(false) {
     RouteFunction("AssertTrue", base::Bind(&AssertNatives::AssertTrue,
@@ -88,8 +91,13 @@ ModuleSystemTest::ModuleSystemTest()
       source_map_(new StringSourceMap()),
       should_assertions_be_made_(true) {
   context_->Enter();
+  v8_context_.reset(
+      new ChromeV8Context(context_,
+                          NULL,
+                          NULL,
+                          extensions::Feature::WEB_PAGE_CONTEXT));
   assert_natives_ = new AssertNatives(context_->GetIsolate());
-  module_system_.reset(new ModuleSystem(context_, source_map_.get()));
+  module_system_.reset(new ModuleSystem(v8_context_.get(), source_map_.get()));
   module_system_->RegisterNativeHandler("assert", scoped_ptr<NativeHandler>(
       assert_natives_));
   module_system_->set_exception_handler(