No longer needs to define node_includes.h at last

atom/browser/api/atom_api_app.cc

@@ -19,6 +19,7 @@
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
@@ -34,8 +35,6 @@
 #include "base/strings/utf_string_conversions.h"
 #endif
 
-#include "atom/common/node_includes.h"
-
 using atom::Browser;
 
 namespace mate {

atom/browser/api/atom_api_auto_updater.cc

@@ -7,11 +7,10 @@
 #include "base/time/time.h"
 #include "atom/browser/auto_updater.h"
 #include "atom/browser/browser.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 
-#include "atom/common/node_includes.h"
-
 namespace atom {
 
 namespace api {

atom/browser/api/atom_api_content_tracing.cc

@@ -7,13 +7,12 @@
 
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "content/public/browser/tracing_controller.h"
 #include "native_mate/dictionary.h"
 
-#include "atom/common/node_includes.h"
-
 using content::TracingController;
 
 namespace mate {

atom/browser/api/atom_api_cookies.cc

@@ -20,8 +20,6 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
-#include "atom/common/node_includes.h"
-
 using atom::api::Cookies;
 using content::BrowserThread;
 

atom/browser/api/atom_api_power_save_blocker.cc

@@ -6,9 +6,9 @@
 
 #include <string>
 
+#include "atom/common/node_includes.h"
 #include "content/public/browser/power_save_blocker.h"
 #include "native_mate/dictionary.h"
-#include "atom/common/node_includes.h"
 
 namespace mate {
 

atom/browser/api/atom_api_protocol.cc

@@ -12,9 +12,8 @@
 #include "atom/browser/net/url_request_fetch_job.h"
 #include "atom/browser/net/url_request_string_job.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "native_mate/dictionary.h"
-
 #include "atom/common/node_includes.h"
+#include "native_mate/dictionary.h"
 
 using content::BrowserThread;
 

atom/browser/api/atom_api_session.cc

@@ -13,6 +13,7 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
@@ -29,8 +30,6 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
-#include "atom/common/node_includes.h"
-
 using content::BrowserThread;
 using content::StoragePartition;
 

atom/browser/api/atom_api_tray.cc

@@ -12,13 +12,12 @@
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/image/image.h"
 
-#include "atom/common/node_includes.h"
-
 namespace atom {
 
 namespace api {

atom/browser/atom_browser_main_parts.cc

@@ -13,6 +13,7 @@
 #include "atom/browser/node_debugger.h"
 #include "atom/common/api/atom_bindings.h"
 #include "atom/common/node_bindings.h"
+#include "atom/common/node_includes.h"
 #include "base/command_line.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
@@ -22,8 +23,6 @@
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #endif
 
-#include "atom/common/node_includes.h"
-
 namespace atom {
 
 // static

atom/common/api/atom_api_asar.cc

@@ -10,13 +10,12 @@
 #include "atom/common/asar/archive.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "native_mate/wrappable.h"
 
-#include "atom/common/node_includes.h"
-
 namespace {
 
 class Archive : public mate::Wrappable {

atom/common/api/atom_api_shell.cc

@@ -7,9 +7,8 @@
 #include "atom/common/platform_util.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
-#include "native_mate/dictionary.h"
-
 #include "atom/common/node_includes.h"
+#include "native_mate/dictionary.h"
 
 namespace {
 

atom/common/api/atom_api_v8_util.cc

@@ -3,11 +3,10 @@
 // found in the LICENSE file.
 
 #include "atom/common/api/object_life_monitor.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 #include "v8/include/v8-profiler.h"
 
-#include "atom/common/node_includes.h"
-
 namespace {
 
 v8::Local<v8::Object> CreateObjectWithName(v8::Isolate* isolate,

atom/common/api/event_emitter_caller.cc

@@ -5,11 +5,10 @@
 #include "atom/common/api/event_emitter_caller.h"
 
 #include "atom/common/api/locker.h"
+#include "atom/common/node_includes.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
-#include "atom/common/node_includes.h"
-
 namespace mate {
 
 namespace internal {

atom/common/node_bindings.cc

@@ -11,6 +11,7 @@
 #include "atom/common/api/locker.h"
 #include "atom/common/atom_command_line.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/command_line.h"
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
@@ -21,8 +22,6 @@
 #include "native_mate/dictionary.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
-#include "atom/common/node_includes.h"
-
 using content::BrowserThread;
 
 // Force all builtin modules to be referenced so they can actually run their

atom/common/node_includes.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_COMMON_NODE_INCLUDES_H_
 #define ATOM_COMMON_NODE_INCLUDES_H_
 
+#include "base/logging.h"
+
 // Include common headers for using node APIs.
 
 #define BUILDING_NODE_EXTENSION

atom/renderer/api/atom_api_renderer_ipc.cc

@@ -5,13 +5,12 @@
 #include "atom/common/api/api_messages.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "content/public/renderer/render_view.h"
 #include "native_mate/dictionary.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
-#include "atom/common/node_includes.h"
-
 using content::RenderView;
 using blink::WebLocalFrame;
 using blink::WebView;

atom/renderer/atom_render_view_observer.cc

@@ -13,6 +13,7 @@
 #include "atom/common/api/api_messages.h"
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/atom_renderer_client.h"
 #include "base/command_line.h"
@@ -31,8 +32,6 @@
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#include "atom/common/node_includes.h"
-
 namespace atom {
 
 namespace {