Move ModuleSystem and NativeHandler to extensions/

TBR=jam@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10879107

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153618 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_renderer.gypi

@@ -99,6 +99,10 @@
         'renderer/extensions/i18n_custom_bindings.h',
         'renderer/extensions/media_gallery_custom_bindings.cc',
         'renderer/extensions/media_gallery_custom_bindings.h',
+        'renderer/extensions/module_system.cc',
+        'renderer/extensions/module_system.h',
+        'renderer/extensions/native_handler.cc',
+        'renderer/extensions/native_handler.h',
         'renderer/extensions/miscellaneous_bindings.cc',
         'renderer/extensions/miscellaneous_bindings.h',
         'renderer/extensions/page_actions_custom_bindings.cc',
@@ -135,10 +139,6 @@
         'renderer/frame_sniffer.h',
         'renderer/loadtimes_extension_bindings.h',
         'renderer/loadtimes_extension_bindings.cc',
-        'renderer/module_system.cc',
-        'renderer/module_system.h',
-        'renderer/native_handler.cc',
-        'renderer/native_handler.h',
         'renderer/net/predictor_queue.cc',
         'renderer/net/predictor_queue.h',
         'renderer/net/renderer_net_predictor.cc',

chrome/chrome_tests.gypi

@@ -2030,7 +2030,7 @@
         'renderer/extensions/chrome_v8_context_set_unittest.cc',
         'renderer/extensions/event_unittest.cc',
         'renderer/extensions/json_schema_unittest.cc',
-        'renderer/module_system_unittest.cc',
+        'renderer/extensions/module_system_unittest.cc',
         'renderer/net/predictor_queue_unittest.cc',
         'renderer/net/renderer_predictor_unittest.cc',
         'renderer/plugins/plugin_uma_unittest.cc',

chrome/renderer/extensions/chrome_v8_context.h

@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/common/extensions/features/feature.h"
-#include "chrome/renderer/module_system.h"
+#include "chrome/renderer/extensions/module_system.h"
 #include "v8/include/v8.h"
 
 namespace WebKit {

chrome/renderer/extensions/chrome_v8_extension.h

@@ -9,7 +9,7 @@
 #include "base/memory/linked_ptr.h"
 #include "base/string_piece.h"
 #include "chrome/renderer/extensions/chrome_v8_extension_handler.h"
-#include "chrome/renderer/native_handler.h"
+#include "chrome/renderer/extensions/native_handler.h"
 #include "v8/include/v8.h"
 
 #include <map>

chrome/renderer/extensions/dispatcher.cc

@@ -36,6 +36,8 @@
 #include "chrome/renderer/extensions/i18n_custom_bindings.h"
 #include "chrome/renderer/extensions/media_gallery_custom_bindings.h"
 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
+#include "chrome/renderer/extensions/module_system.h"
+#include "chrome/renderer/extensions/native_handler.h"
 #include "chrome/renderer/extensions/page_actions_custom_bindings.h"
 #include "chrome/renderer/extensions/page_capture_custom_bindings.h"
 #include "chrome/renderer/extensions/request_sender.h"
@@ -48,8 +50,6 @@
 #include "chrome/renderer/extensions/user_script_slave.h"
 #include "chrome/renderer/extensions/web_request_custom_bindings.h"
 #include "chrome/renderer/extensions/webstore_bindings.h"
-#include "chrome/renderer/module_system.h"
-#include "chrome/renderer/native_handler.h"
 #include "chrome/renderer/resource_bundle_source_map.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"

chrome/renderer/module_system.cc → chrome/renderer/extensions/module_system.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/module_system.h"
+#include "chrome/renderer/extensions/module_system.h"
 
 #include "base/bind.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedMicrotaskSuppression.h"
@@ -16,6 +16,8 @@ const char* kModulesField = "modules";
 
 } // namespace
 
+namespace extensions {
+
 ModuleSystem::ModuleSystem(v8::Handle<v8::Context> context,
                            SourceMap* source_map)
     : context_(v8::Persistent<v8::Context>::New(context)),
@@ -265,3 +267,5 @@ v8::Handle<v8::String> ModuleSystem::WrapSource(v8::Handle<v8::String> source) {
 v8::Handle<v8::Value> ModuleSystem::ThrowException(const std::string& message) {
   return v8::ThrowException(v8::String::New(message.c_str()));
 }
+
+}  // extensions

chrome/renderer/module_system.h → chrome/renderer/extensions/module_system.h

@@ -2,19 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_MODULE_SYSTEM_H_
-#define CHROME_RENDERER_MODULE_SYSTEM_H_
+#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"
-#include "chrome/renderer/native_handler.h"
+#include "chrome/renderer/extensions/native_handler.h"
 #include "v8/include/v8.h"
 
 #include <map>
 #include <set>
 #include <string>
 
+namespace extensions {
+
 // A module system for JS similar to node.js' require() function.
 // Each module has three variables in the global scope:
 //   - exports, an object returned to dependencies who require() this
@@ -137,4 +139,6 @@ class ModuleSystem : public NativeHandler {
   DISALLOW_COPY_AND_ASSIGN(ModuleSystem);
 };
 
-#endif  // CHROME_RENDERER_MODULE_SYSTEM_H_
+}  // extensions
+
+#endif  // CHROME_RENDERER_EXTENSIONS_MODULE_SYSTEM_H_

chrome/renderer/module_system_unittest.cc → chrome/renderer/extensions/module_system_unittest.cc

@@ -4,7 +4,10 @@
 
 #include "chrome/test/base/module_system_test.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/renderer/module_system.h"
+#include "chrome/renderer/extensions/module_system.h"
+
+using extensions::ModuleSystem;
+using extensions::NativeHandler;
 
 class CounterNatives : public NativeHandler {
  public:

chrome/renderer/native_handler.cc → chrome/renderer/extensions/native_handler.cc

@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/native_handler.h"
+#include "chrome/renderer/extensions/native_handler.h"
 
 #include "base/memory/linked_ptr.h"
 #include "base/logging.h"
-#include "chrome/renderer/module_system.h"
+#include "chrome/renderer/extensions/module_system.h"
 #include "v8/include/v8.h"
 
+namespace extensions {
+
 NativeHandler::NativeHandler()
     : object_template_(
         v8::Persistent<v8::ObjectTemplate>::New(v8::ObjectTemplate::New())) {
@@ -54,3 +56,5 @@ void NativeHandler::RouteStaticFunction(const std::string& name,
       v8::FunctionTemplate::New(handler_func, v8::External::New(this));
   object_template_->Set(name.c_str(), function_template);
 }
+
+}   // extensions

chrome/renderer/native_handler.h → chrome/renderer/extensions/native_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_NATIVE_HANDLER_H_
-#define CHROME_RENDERER_NATIVE_HANDLER_H_
+#ifndef CHROME_RENDERER_EXTENSIONS_NATIVE_HANDLER_H_
+#define CHROME_RENDERER_EXTENSIONS_NATIVE_HANDLER_H_
 
 #include "base/bind.h"
 #include "base/memory/linked_ptr.h"
@@ -12,6 +12,8 @@
 #include <string>
 #include <vector>
 
+namespace extensions {
+
 // A NativeHandler is a factory for JS objects with functions on them that map
 // to native C++ functions. Subclasses should call RouteFunction() in their
 // constructor to define functions on the created JS objects.
@@ -53,4 +55,6 @@ class NativeHandler {
   DISALLOW_COPY_AND_ASSIGN(NativeHandler);
 };
 
-#endif  // CHROME_RENDERER_NATIVE_HANDLER_H_
+}  // extensions
+
+#endif  // CHROME_RENDERER_EXTENSIONS_NATIVE_HANDLER_H_

chrome/renderer/resource_bundle_source_map.h

@@ -8,7 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/string_piece.h"
-#include "chrome/renderer/module_system.h"
+#include "chrome/renderer/extensions/module_system.h"
 #include "chrome/renderer/static_v8_external_string_resource.h"
 #include "v8/include/v8.h"
 
@@ -19,7 +19,7 @@ namespace ui {
   class ResourceBundle;
 }
 
-class ResourceBundleSourceMap : public ModuleSystem::SourceMap {
+class ResourceBundleSourceMap : public extensions::ModuleSystem::SourceMap {
  public:
   explicit ResourceBundleSourceMap(const ui::ResourceBundle* resource_bundle);
   ~ResourceBundleSourceMap();

chrome/test/base/module_system_test.cc

@@ -7,13 +7,16 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
-#include "chrome/renderer/native_handler.h"
+#include "chrome/renderer/extensions/native_handler.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #include <map>
 #include <string>
 
+using extensions::ModuleSystem;
+using extensions::NativeHandler;
+
 // Native JS functions for doing asserts.
 class AssertNatives : public NativeHandler {
  public:

chrome/test/base/module_system_test.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_TEST_BASE_MODULE_SYSTEM_TEST_H_
 #define CHROME_TEST_BASE_MODULE_SYSTEM_TEST_H_
 
-#include "chrome/renderer/module_system.h"
+#include "chrome/renderer/extensions/module_system.h"
 #include "v8/include/v8.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -55,7 +55,7 @@ class ModuleSystemTest : public testing::Test {
   v8::TryCatch try_catch_;
   AssertNatives* assert_natives_;
   scoped_ptr<StringSourceMap> source_map_;
-  scoped_ptr<ModuleSystem> module_system_;
+  scoped_ptr<extensions::ModuleSystem> module_system_;
   bool should_assertions_be_made_;
 };