Bring back build/include_order cpplint.

atom/app/atom_main_delegate.cc

@@ -4,6 +4,8 @@
 
 #include "atom/app/atom_main_delegate.h"
 
+#include <string>
+
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"

atom/browser/api/atom_api_app.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/api/atom_api_app.h"
 
+#include <string>
+
 #include "base/values.h"
 #include "base/command_line.h"
 #include "atom/browser/browser.h"

atom/browser/api/atom_api_app.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_APP_H_
 #define ATOM_BROWSER_API_ATOM_API_APP_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "atom/browser/browser_observer.h"
 #include "atom/common/api/atom_api_event_emitter.h"

atom/browser/api/atom_api_auto_updater.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
 #define ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "atom/browser/auto_updater_delegate.h"

atom/browser/api/atom_api_dialog.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/api/atom_api_dialog.h"
 
+#include <string>
+#include <vector>
+
 #include "base/bind.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/file_dialog.h"

atom/browser/api/atom_api_menu.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/api/atom_api_menu.h"
 
+#include <string>
+
 #include "atom/browser/ui/accelerator_util.h"
 #include "atom/common/v8/node_common.h"
 #include "atom/common/v8/native_type_conversions.h"

atom/browser/api/atom_api_menu_mac.h

@@ -7,6 +7,8 @@
 
 #include "atom/browser/api/atom_api_menu.h"
 
+#include <string>
+
 #import "atom/browser/ui/cocoa/atom_menu_controller.h"
 
 namespace atom {

atom/browser/api/atom_api_window.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/api/atom_api_window.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/process/kill.h"
 #include "atom/browser/native_window.h"

atom/browser/api/atom_api_window.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_WINDOW_H_
 #define ATOM_BROWSER_API_ATOM_API_WINDOW_H_
 
+#include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"

atom/browser/atom_javascript_dialog_manager.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/atom_javascript_dialog_manager.h"
 
+#include <string>
+
 #include "base/strings/utf_string_conversions.h"
 
 namespace atom {

atom/browser/atom_javascript_dialog_manager.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
 #define ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
 
+#include <string>
+
 #include "content/public/browser/javascript_dialog_manager.h"
 
 namespace atom {

atom/browser/browser.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/browser.h"
 
+#include <string>
+
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/window_list.h"
 

atom/browser/browser.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_BROWSER_H_
 #define ATOM_BROWSER_BROWSER_H_
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"

atom/browser/devtools_delegate.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/devtools_delegate.h"
 
+#include <string>
+
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "atom/browser/native_window.h"

atom/browser/devtools_delegate.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_DEVTOOLS_DELEGATE_H_
 #define ATOM_BROWSER_DEVTOOLS_DELEGATE_H_
 
+#include <string>
+
 #include "base/memory/scoped_ptr.h"
 #include "atom/browser/native_window_observer.h"
 #include "content/public/browser/devtools_frontend_host_delegate.h"

atom/browser/native_window.cc

@@ -5,6 +5,8 @@
 #include "atom/browser/native_window.h"
 
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"

atom/browser/native_window.h

@@ -5,6 +5,9 @@
 #ifndef ATOM_BROWSER_NATIVE_WINDOW_H_
 #define ATOM_BROWSER_NATIVE_WINDOW_H_
 
+#include <string>
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"

atom/browser/native_window_gtk.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/native_window_gtk.h"
 
+#include <string>
+#include <vector>
+
 #include "base/values.h"
 #include "chrome/browser/ui/gtk/gtk_window_util.h"
 #include "atom/common/draggable_region.h"

atom/browser/native_window_gtk.h

@@ -7,6 +7,9 @@
 
 #include <gtk/gtk.h>
 
+#include <string>
+#include <vector>
+
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/accelerator_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"

atom/browser/native_window_win.cc

@@ -4,13 +4,16 @@
 
 #include "atom/browser/native_window_win.h"
 
-#include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
+#include <string>
+#include <vector>
+
 #include "atom/browser/api/atom_api_menu.h"
 #include "atom/browser/ui/win/menu_2.h"
 #include "atom/browser/ui/win/native_menu_win.h"
 #include "atom/common/draggable_region.h"
 #include "atom/common/options_switches.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"

atom/browser/native_window_win.h

@@ -5,6 +5,10 @@
 #ifndef ATOM_BROWSER_NATIVE_WINDOW_WIN_H_
 #define ATOM_BROWSER_NATIVE_WINDOW_WIN_H_
 
+#include <map>
+#include <string>
+#include <vector>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "atom/browser/native_window.h"

atom/browser/net/adapter_request_job.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_NET_ADAPTER_REQUEST_JOB_H_
 #define ATOM_BROWSER_NET_ADAPTER_REQUEST_JOB_H_
 
+#include <string>
+
 #include "base/memory/weak_ptr.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"

atom/browser/net/atom_url_request_context_getter.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/net/atom_url_request_context_getter.h"
 
+#include <algorithm>
+
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"

atom/browser/net/atom_url_request_job_factory.h

@@ -7,6 +7,7 @@
 #define ATOM_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
 
 #include <map>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"

atom/browser/net/url_request_string_job.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/net/url_request_string_job.h"
 
+#include <string>
+
 #include "net/base/net_errors.h"
 
 namespace atom {

atom/browser/net/url_request_string_job.h

@@ -7,6 +7,8 @@
 
 #include "net/url_request/url_request_simple_job.h"
 
+#include <string>
+
 namespace atom {
 
 class URLRequestStringJob : public net::URLRequestSimpleJob {

atom/browser/ui/accelerator_util.cc

@@ -7,6 +7,7 @@
 #include <stdio.h>
 
 #include <string>
+#include <vector>
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"

atom/common/api/atom_api_clipboard.cc

@@ -5,6 +5,7 @@
 #include "atom/common/api/atom_api_clipboard.h"
 
 #include <string>
+#include <vector>
 
 #include "atom/common/v8/native_type_conversions.h"
 #include "ui/base/clipboard/clipboard.h"

atom/common/api/atom_api_crash_reporter.cc

@@ -4,6 +4,9 @@
 
 #include "atom/common/api/atom_api_crash_reporter.h"
 
+#include <map>
+#include <string>
+
 #include "atom/common/crash_reporter/crash_reporter.h"
 #include "atom/common/v8/native_type_conversions.h"
 

atom/common/api/atom_bindings.cc

@@ -4,6 +4,8 @@
 
 #include "atom/common/api/atom_bindings.h"
 
+#include <string>
+
 #include "base/logging.h"
 #include "atom/common/atom_version.h"
 #include "atom/common/v8/native_type_conversions.h"

atom/common/crash_reporter/crash_reporter_linux.cc

@@ -8,6 +8,8 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#include <string>
+
 #include "base/debug/crash_logging.h"
 #include "base/files/file_path.h"
 #include "base/linux_util.h"

atom/common/crash_reporter/crash_reporter_linux.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
 #define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "atom/common/crash_reporter/crash_reporter.h"

atom/common/crash_reporter/crash_reporter_mac.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
 #define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "atom/common/crash_reporter/crash_reporter.h"
 #import "vendor/breakpad/src/client/mac/Framework/Breakpad.h"

atom/common/crash_reporter/crash_reporter_win.cc

@@ -4,6 +4,8 @@
 
 #include "atom/common/crash_reporter/crash_reporter_win.h"
 
+#include <string>
+
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"

atom/common/crash_reporter/crash_reporter_win.h

@@ -5,6 +5,9 @@
 #ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
 #define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
 
+#include <string>
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "atom/common/crash_reporter/crash_reporter.h"

atom/common/node_bindings.cc

@@ -4,6 +4,9 @@
 
 #include "atom/common/node_bindings.h"
 
+#include <string>
+#include <vector>
+
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/base_paths.h"

atom/common/v8/v8_value_converter.cc

@@ -5,6 +5,7 @@
 #include "atom/common/v8/v8_value_converter.h"
 
 #include <string>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"

atom/renderer/api/atom_renderer_bindings.cc

@@ -4,6 +4,8 @@
 
 #include "atom/renderer/api/atom_renderer_bindings.h"
 
+#include <vector>
+
 #include "atom/common/v8/native_type_conversions.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/web/WebFrame.h"

atom/renderer/atom_render_view_observer.cc

@@ -4,6 +4,8 @@
 
 #include "atom/renderer/atom_render_view_observer.h"
 
+#include <vector>
+
 #include "atom/common/api/api_messages.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_message_macros.h"

atom/renderer/atom_renderer_client.cc

@@ -5,6 +5,7 @@
 #include "atom/renderer/atom_renderer_client.h"
 
 #include <algorithm>
+#include <string>
 
 #include "base/command_line.h"
 #include "atom/common/node_bindings.h"

atom/renderer/atom_renderer_client.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
 #define ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
 
+#include <string>
 #include <vector>
 
 #include "content/public/renderer/content_renderer_client.h"

script/cpplint.py

@@ -7,6 +7,7 @@ import sys
 from lib.util import execute
 
 IGNORE_FILES = [
+  os.path.join('atom', 'app', 'atom_main.cc'),
   os.path.join('atom', 'browser', 'atom_application_mac.h'),
   os.path.join('atom', 'browser', 'atom_application_delegate_mac.h'),
   os.path.join('atom', 'browser', 'native_window_mac.h'),
@@ -44,8 +45,7 @@ def list_files(directories, filters):
 
 def call_cpplint(files):
   cpplint = os.path.join(SOURCE_ROOT, 'vendor', 'depot_tools', 'cpplint.py')
-  rules = '--filter=-build/include_what_you_use'
-  execute([sys.executable, cpplint, rules] + files)
+  execute([sys.executable, cpplint] + files)
 
 
 if __name__ == '__main__':