Update from https://crrev.com/306655

gin/modules/module_registry_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 "gin/modules/module_registry.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "gin/modules/module_registry_observer.h"
 #include "gin/modules/module_runner_delegate.h"
@@ skipping 52 matching lines @@
                     v8::Isolate* isolate,
                     int64_t* counter,
                     v8::Handle<v8::Value> value) {
   ASSERT_TRUE(value->IsNumber());
   v8::Handle<v8::Integer> int_value = v8::Handle<v8::Integer>::Cast(value);
   *counter += int_value->Value();
   ModuleRegistry::From(helper->runner->GetContextHolder()->context())
       ->LoadModule(isolate, "two", base::Bind(NestedCallback));
 }
 
+void OnModuleLoadedNoOp(v8::Handle<v8::Value> value) {
+  ASSERT_TRUE(value->IsNumber());
+}
+
 }  // namespace
 
 typedef V8Test ModuleRegistryTest;
 
 // Verifies ModuleRegistry is not available after ContextHolder has been
 // deleted.
 TEST_F(ModuleRegistryTest, DestroyedWithContext) {
   v8::Isolate::Scope isolate_scope(instance_->isolate());
   v8::HandleScope handle_scope(instance_->isolate());
   v8::Handle<v8::Context> context = v8::Context::New(
@@ skipping 43 matching lines @@
       base::Bind(OnModuleLoaded, &helper, instance_->isolate(), &counter);
   for (int i = 0; i < 3; i++) {
     ModuleRegistry::From(helper.runner->GetContextHolder()->context())
         ->LoadModule(instance_->isolate(), "one", callback);
   }
   EXPECT_EQ(0, counter);
   helper.runner->Run(source, "script");
   EXPECT_EQ(3, counter);
 }
 
+// Verifies that explicitly loading a module that's already pending does
+// not cause the ModuleRegistry's unsatisfied_dependency set to grow.
+TEST_F(ModuleRegistryTest, UnsatisfiedDependenciesTest) {
+  TestHelper helper(instance_->isolate());
+  std::string source =
+      "define('one', ['no_such_module'], function(nsm) {"
+      "  return 1;"
+      "});";
+  ModuleRegistry* registry =
+    ModuleRegistry::From(helper.runner->GetContextHolder()->context());
+
+  std::set<std::string> no_such_module_set;
+  no_such_module_set.insert("no_such_module");
+
+  // Adds one unsatisfied dependency on "no-such-module".
+  helper.runner->Run(source, "script");
+  EXPECT_EQ(no_such_module_set, registry->unsatisfied_dependencies());
+
+  // Should have no effect on the unsatisfied_dependencies set.
+  ModuleRegistry::LoadModuleCallback callback = base::Bind(OnModuleLoadedNoOp);
+  registry->LoadModule(instance_->isolate(), "one", callback);
+  EXPECT_EQ(no_such_module_set, registry->unsatisfied_dependencies());
+}
+
 }  // namespace gin