Refactors parts of gin:

gin/modules/module_registry.h

 // Copyright 2013 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.
 
 #ifndef GIN_MODULES_MODULE_REGISTRY_H_
 #define GIN_MODULES_MODULE_REGISTRY_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "gin/gin_export.h"
 #include "gin/per_context_data.h"
 
 namespace gin {
 
-struct PendingModule;
+struct GIN_EXPORT PendingModule {
+  PendingModule();
+  ~PendingModule();
+
+  std::string id;
+  std::vector<std::string> dependencies;
+  v8::Persistent<v8::Value> factory;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PendingModule);
+};
+
+// ModuleLoader is responsible for registering the necessary bindings for
+// modules with v8 as well as responding to the bindings (by way of
+// Load()). Subclasses should invoke the appropriate RegisterGlobals
+// function. ModuleLoader is owned by the context.
+class GIN_EXPORT ModuleLoader : public ContextSupplement {
+ public:
+  static ModuleLoader* From(v8::Handle<v8::Context> context);
+
+  // Loads the specified module. Loading need not be synchronous, and often is
+  // not.
+  virtual void Load(v8::Handle<v8::Context> context,
+                    scoped_ptr<PendingModule> pending) = 0;
+
+ protected:
+  explicit ModuleLoader(v8::Handle<v8::Context> context);
+  virtual ~ModuleLoader();
+
+  static void RegisterGlobals(v8::Isolate* isolate,
+                              v8::Handle<v8::ObjectTemplate> templ);
+  static void RegisterGlobalsObject(v8::Isolate* isolate,
+                                    v8::Handle<v8::Object> obj);
+
+ private:
+  // From ContextSupplement:
+  virtual void Detach(v8::Handle<v8::Context> context) OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(ModuleLoader);
+};
 
 // This class implements the Asynchronous Module Definition (AMD) API.
 // https://github.com/amdjs/amdjs-api/wiki/AMD
 //
 // Our implementation isn't complete yet. Missing features:
 //   1) Built-in support for require, exports, and module.
 //   2) Path resoltuion in module names.
 //
 // For these reasons, we don't have an "amd" property on the "define"
 // function. The spec says we should only add that property once our
 // implementation complies with the specification.
 //
 class GIN_EXPORT ModuleRegistry : public ContextSupplement {
  public:
   typedef base::Callback<void (v8::Handle<v8::Value>)> LoadModuleCallback;
 
   virtual ~ModuleRegistry();
 
   static ModuleRegistry* From(v8::Handle<v8::Context> context);
 
-  static void RegisterGlobals(v8::Isolate* isolate,
-                              v8::Handle<v8::ObjectTemplate> templ);
-
   // The caller must have already entered our context.
   void AddBuiltinModule(v8::Isolate* isolate, const std::string& id,
                         v8::Handle<v8::Value> module);
 
   // The caller must have already entered our context.
   void AddPendingModule(v8::Isolate* isolate,
                         scoped_ptr<PendingModule> pending);
 
   void LoadModule(v8::Isolate* isolate,
                   const std::string& id,
@@ skipping 36 matching lines @@
 
   PendingModuleVector pending_modules_;
   v8::Persistent<v8::Object> modules_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleRegistry);
 };
 
 }  // namespace gin
 
 #endif  // GIN_MODULES_MODULE_REGISTRY_H_