Move ModuleSystemTest and the tests that use it into extensions/.

extensions/renderer/module_system_test.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_TEST_BASE_MODULE_SYSTEM_TEST_H_
-#define CHROME_TEST_BASE_MODULE_SYSTEM_TEST_H_
+#ifndef EXTENSIONS_RENDERER_MODULE_SYSTEM_TEST_H_
+#define EXTENSIONS_RENDERER_MODULE_SYSTEM_TEST_H_
 
-#include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "extensions/renderer/module_system.h"
 #include "extensions/renderer/scoped_persistent.h"
+#include "extensions/renderer/script_context.h"
 #include "gin/public/context_holder.h"
 #include "gin/public/isolate_holder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "v8/include/v8.h"
 

[not at google - send to devlin, 2014/07/10 15:22:56]

can we move this file into the extensions namespace now, and remove all the
references to "extensions::"?

[Sam McNally, 2014/07/11 00:01:17]

Done.

 class ModuleSystemTestEnvironment {
  public:
   class AssertNatives;
   class StringSourceMap;
 
   explicit ModuleSystemTestEnvironment(gin::IsolateHolder* isolate_holder);
   ~ModuleSystemTestEnvironment();
 
   // Register a named JS module in the module system.
   void RegisterModule(const std::string& name, const std::string& code);
@@ skipping 15 matching lines @@
   v8::Handle<v8::Object> CreateGlobal(const std::string& name);
 
   void ShutdownGin();
 
   void ShutdownModuleSystem();
 
   extensions::ModuleSystem* module_system() {
     return context_->module_system();
   }
 
-  extensions::ChromeV8Context* context() { return context_.get(); }
+  extensions::ScriptContext* context() { return context_.get(); }
 
   v8::Isolate* isolate() { return isolate_holder_->isolate(); }
 
   AssertNatives* assert_natives() { return assert_natives_; }
 
  private:
   gin::IsolateHolder* isolate_holder_;
   scoped_ptr<gin::ContextHolder> context_holder_;
   v8::HandleScope handle_scope_;
-  scoped_ptr<extensions::ChromeV8Context> context_;
+  scoped_ptr<extensions::ScriptContext> context_;
   AssertNatives* assert_natives_;
   scoped_ptr<StringSourceMap> source_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleSystemTestEnvironment);
 };
 
 // Test fixture for testing JS that makes use of the module system.
 //
 // Typically tests will look like:
 //
 // TEST_F(MyModuleSystemTest, TestStuff) {
 //   ModuleSystem::NativesEnabledScope natives_enabled(module_system_.get());
 //   RegisterModule("test", "requireNative('assert').AssertTrue(true);");
 //   module_system_->Require("test");
 // }
 //
 // By default a test will fail if no method in the native module 'assert' is
 // called. This behaviour can be overridden by calling ExpectNoAssertionsMade().
-//
-// TODO(kalman): move this back into chrome/renderer/extensions.

[not at google - send to devlin, 2014/07/10 15:22:56]

thanks :)

 class ModuleSystemTest : public testing::Test {
  public:
   ModuleSystemTest();
   virtual ~ModuleSystemTest();
 
   virtual void TearDown() OVERRIDE;
 
  protected:
   ModuleSystemTestEnvironment* env() { return env_.get(); }
 
   scoped_ptr<ModuleSystemTestEnvironment> CreateEnvironment();
 
   // Make the test fail if any asserts are called. By default a test will fail
   // if no asserts are called.
   void ExpectNoAssertionsMade();
 
   // Runs promises that have been resolved. Resolved promises will not run
   // until this is called.
   void RunResolvedPromises();
 
  private:
   gin::IsolateHolder isolate_holder_;
   scoped_ptr<ModuleSystemTestEnvironment> env_;
   bool should_assertions_be_made_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ModuleSystemTest);
 };
 
-#endif  // CHROME_TEST_BASE_MODULE_SYSTEM_TEST_H_
+#endif  // EXTENSIONS_RENDERER_MODULE_SYSTEM_TEST_H_