extensions: Use V8 Maybe APIs in ModuleSystem

extensions/renderer/module_system_unittest.cc

 // Copyright 2014 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "extensions/renderer/module_system.h"
 #include "extensions/renderer/module_system_test.h"
 #include "gin/modules/module_registry.h"
 
 namespace extensions {
@@ skipping 16 matching lines @@
   void Increment(const v8::FunctionCallbackInfo<v8::Value>& args) {
     counter_++;
   }
 
  private:
   int counter_;
 };
 
 class TestExceptionHandler : public ModuleSystem::ExceptionHandler {
  public:
-  TestExceptionHandler() : handled_exception_(false) {}
+  TestExceptionHandler()
+      : ModuleSystem::ExceptionHandler(NULL), handled_exception_(false) {}

[not at google - send to devlin, 2015/06/12 16:51:37]

Same s/NULL/nullptr/.

[bashi, 2015/06/16 03:12:47]

Done.

 
   void HandleUncaughtException(const v8::TryCatch& try_catch) override {
     handled_exception_ = true;
   }
 
   bool handled_exception() const { return handled_exception_; }
 
  private:
   bool handled_exception_;
 };
@@ skipping 349 matching lines @@
       "    requireNative('assert').AssertTrue(result == 'pong');"
       "  });"
       "});");
   scoped_ptr<ModuleSystemTestEnvironment> other_env = CreateEnvironment();
   other_env->RegisterModule("ping",
                             "define('ping', ['natives'], function(natives) {"
                             "  return function() {"
                             "    return 'pong';"
                             "  }"
                             "});");
-  gin::ModuleRegistry::From(env()->context()->v8_context())->AddBuiltinModule(
-      env()->isolate(), "natives", other_env->module_system()->NewInstance());
+  gin::ModuleRegistry::From(env()->context()->v8_context())
+      ->AddBuiltinModule(
+          env()->isolate(), "natives",
+          other_env->module_system()->NewInstance());
   gin::ModuleRegistry::From(other_env->context()->v8_context())
       ->AddBuiltinModule(
-          env()->isolate(), "natives", env()->module_system()->NewInstance());
+          env()->isolate(), "natives",
+          env()->module_system()->NewInstance());
   env()->module_system()->Require("test");
   RunResolvedPromises();
 }
 
 TEST_F(ModuleSystemTest, TestRequireAsyncBetweenContexts) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(
       env()->module_system());
   env()->RegisterModule("pong",
                         "define('pong', [], function() {"
                         "  return function() { return 'done'; };"
                         "});");
   env()->RegisterModule(
       "test",
       "requireAsync('natives').then(function(natives) {"
       "  natives.requireAsync('ping').then(function(ping) {"
       "    return ping();"
       "  }).then(function(pong) {"
       "    return pong();"
       "  }).then(function(result) {"
       "    requireNative('assert').AssertTrue(result == 'done');"
       "  });"
       "});");
   scoped_ptr<ModuleSystemTestEnvironment> other_env = CreateEnvironment();
   other_env->RegisterModule("ping",
                             "define('ping', ['natives'], function(natives) {"
                             "  return function() {"
                             "    return natives.requireAsync('pong');"
                             "  }"
                             "});");
-  gin::ModuleRegistry::From(env()->context()->v8_context())->AddBuiltinModule(
-      env()->isolate(), "natives", other_env->module_system()->NewInstance());
+  gin::ModuleRegistry::From(env()->context()->v8_context())
+      ->AddBuiltinModule(
+          env()->isolate(), "natives",
+          other_env->module_system()->NewInstance());
   gin::ModuleRegistry::From(other_env->context()->v8_context())
       ->AddBuiltinModule(
-          env()->isolate(), "natives", env()->module_system()->NewInstance());
+          env()->isolate(), "natives",
+          env()->module_system()->NewInstance());
   env()->module_system()->Require("test");
   RunResolvedPromises();
 }
 
 TEST_F(ModuleSystemTest, TestRequireAsyncFromContextWithNoModuleRegistry) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(
       env()->module_system());
   env()->RegisterModule("test",
                         "requireAsync('natives').then(function(natives) {"
                         "  var AssertTrue = requireNative('assert').AssertTrue;"
                         "  natives.requireAsync('foo').then(function() {"
                         "    AssertTrue(false);"
                         "  }).catch(function(error) {"
                         "    AssertTrue(error.message == "
                         "               'Extension view no longer exists');"
                         "  });"
                         "});");
   scoped_ptr<ModuleSystemTestEnvironment> other_env = CreateEnvironment();
-  gin::ModuleRegistry::From(env()->context()->v8_context())->AddBuiltinModule(
-      env()->isolate(), "natives", other_env->module_system()->NewInstance());
+  gin::ModuleRegistry::From(env()->context()->v8_context())
+      ->AddBuiltinModule(
+          env()->isolate(), "natives",
+          other_env->module_system()->NewInstance());
   other_env->ShutdownGin();
   env()->module_system()->Require("test");
   RunResolvedPromises();
 }
 
 TEST_F(ModuleSystemTest, TestRequireAsyncFromContextWithNoModuleSystem) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(
       env()->module_system());
   env()->RegisterModule("test",
                         "requireAsync('natives').then(function(natives) {"
                         "  requireNative('assert').AssertTrue("
                         "      natives.requireAsync('foo') === undefined);"
                         "});");
   scoped_ptr<ModuleSystemTestEnvironment> other_env = CreateEnvironment();
-  gin::ModuleRegistry::From(env()->context()->v8_context())->AddBuiltinModule(
-      env()->isolate(), "natives", other_env->module_system()->NewInstance());
+  gin::ModuleRegistry::From(env()->context()->v8_context())
+      ->AddBuiltinModule(
+          env()->isolate(), "natives",
+          other_env->module_system()->NewInstance());
   other_env->ShutdownModuleSystem();
   env()->module_system()->Require("test");
   RunResolvedPromises();
 }
 
 }  // namespace extensions