Attempting to fix problems in 11571014.

chrome/renderer/extensions/module_system.h

 // Copyright (c) 2012 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 CHROME_RENDERER_EXTENSIONS_MODULE_SYSTEM_H_
 #define CHROME_RENDERER_EXTENSIONS_MODULE_SYSTEM_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 46 matching lines @@
 
    private:
     ModuleSystem* module_system_;
     DISALLOW_COPY_AND_ASSIGN(NativesEnabledScope);
   };
 
   // |source_map| is a weak pointer.
   ModuleSystem(v8::Handle<v8::Context> context, SourceMap* source_map);
   virtual ~ModuleSystem();
 
-  // Returns true if the current context has a ModuleSystem installed in it.
-  static bool IsPresentInCurrentContext();
-
   // Dumps the debug info from |try_catch| to LOG(ERROR).
   static void DumpException(const v8::TryCatch& try_catch);
 
   // Require the specified module. This is the equivalent of calling
   // require('module_name') from the loaded JS files.
   v8::Handle<v8::Value> Require(const std::string& module_name);
   v8::Handle<v8::Value> Require(const v8::Arguments& args);
 
   // Calls the specified method exported by the specified module. This is
   // equivalent to calling require('module_name').method_name() from JS.
@@ skipping 43 matching lines @@
   // requireNative(|module_name|)[|module_field|].
   void SetNativeLazyField(v8::Handle<v8::Object> object,
                           const std::string& field,
                           const std::string& module_name,
                           const std::string& module_field);
 
   void set_exception_handler(scoped_ptr<ExceptionHandler> handler) {
     exception_handler_ = handler.Pass();
   }
 
-  virtual bool Invalidate() OVERRIDE;
+ protected:
+  friend class ChromeV8Context;
+  virtual void Invalidate() OVERRIDE;
 
  private:
   typedef std::map<std::string, linked_ptr<NativeHandler> > NativeHandlerMap;
 
   // Called when an exception is thrown but not caught.
   void HandleException(const v8::TryCatch& try_catch);
 
   static std::string CreateExceptionString(const v8::TryCatch& try_catch);
 
   // Ensure that require_ has been evaluated from require.js.
   void EnsureRequireLoaded();
 
   // Run |code| in the current context with the name |name| used for stack
   // traces.
   v8::Handle<v8::Value> RunString(v8::Handle<v8::String> code,
                                   v8::Handle<v8::String> name);
 
   v8::Handle<v8::Value> RequireForJs(const v8::Arguments& args);
   v8::Handle<v8::Value> RequireForJsInner(v8::Handle<v8::String> module_name);
 
   // Sets a lazy field using the specified |getter|.
   void SetLazyField(v8::Handle<v8::Object> object,
                     const std::string& field,
                     const std::string& module_name,
                     const std::string& module_field,
                     v8::AccessorGetter getter);
 
-  typedef v8::Handle<v8::Value> (ModuleSystem::*GetModuleFunc)(
+  typedef v8::Handle<v8::Value> (ModuleSystem::*RequireFn)(

[Matt Perry, 2013/03/05 21:51:38]

don't abbrev. RequireFunction

[not at google - send to devlin, 2013/03/05 22:05:38]

Done.

       const std::string&);
-  // Base implementation of a LazyFieldGetter that can be customized by passing
-  // in a |get_module| function.
+  // Base implementation of a LazyFieldGetter which uses |require_fn| to require
+  // modules.
   static v8::Handle<v8::Value> LazyFieldGetterInner(
       v8::Local<v8::String> property,
       const v8::AccessorInfo& info,
-      GetModuleFunc get_module);
+      RequireFn require_fn);
 
   // Return the named source file stored in the source map.
   // |args[0]| - the name of a source file in source_map_.
   v8::Handle<v8::Value> GetSource(v8::Handle<v8::String> source_name);
 
   // Return an object that contains the native methods defined by the named
   // NativeHandler.
   // |args[0]| - the name of a native handler object.
   v8::Handle<v8::Value> RequireNativeFromString(const std::string& native_name);
   v8::Handle<v8::Value> RequireNative(const v8::Arguments& args);
 
   // Wraps |source| in a (function(require, requireNative, exports) {...}).
   v8::Handle<v8::String> WrapSource(v8::Handle<v8::String> source);
 
   // Throws an exception in the calling JS context.
   v8::Handle<v8::Value> ThrowException(const std::string& message);
 
   // A map from module names to the JS source for that module. GetSource()
   // performs a lookup on this map.
   SourceMap* source_map_;
 
   // A map from native handler names to native handlers.
   NativeHandlerMap native_handler_map_;
 
   // When 0, natives are disabled, otherwise indicates how many callers have
   // pinned natives as enabled.
   int natives_enabled_;
 
-  // Set to false if |context_| has been deleted and this should not be used.
-  bool is_valid_;
-
   // Called when an exception is thrown but not caught in JS.
   scoped_ptr<ExceptionHandler> exception_handler_;
 
   std::set<std::string> overridden_native_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleSystem);
 };
 
 }  // extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_MODULE_SYSTEM_H_