fix: fix gn cpplint warnings (#14583)

* chore: fix cpplint 'include_what_you_use' warnings

Typically by including <memory>, <utility> etc.

* chore: fix 'static/global string constant' warning

Use C style strings instead of std::string.

Style guide forbids non-trivial static / global variables. https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables

/home/charles/electron/electron-gn/src/electron/script/cpplint.js

* refactor: remove global string variables.

Fix 'global string variables are not permitted' linter warnings
by using the base::NoDestructor<> wrapper to make it explicit that
these variables are never destroyed.

The style guide's take on globals with nontrivial destructors:
https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables

* fix: initializer error introduced in last commit

* fix: remove WIP file that was included by accident

* fix: include order

* fix: include order

* fix: include order

* fix: include order, again

atom/app/atom_main_delegate.cc

@@ -5,6 +5,7 @@
 #include "atom/app/atom_main_delegate.h"
 
 #include <iostream>
+#include <memory>
 #include <string>
 
 #include "atom/app/atom_content_client.h"

atom/app/atom_main_delegate.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_APP_ATOM_MAIN_DELEGATE_H_
 #define ATOM_APP_ATOM_MAIN_DELEGATE_H_
 
+#include <memory>
 #include <string>
 
 #include "brightray/common/content_client.h"

atom/app/node_main.cc

@@ -6,6 +6,9 @@
 
 #include "atom/app/node_main.h"
 
+#include <memory>
+#include <utility>
+
 #include "atom/app/uv_task_runner.h"
 #include "atom/browser/javascript_environment.h"
 #include "atom/browser/node_debugger.h"

atom/browser/api/atom_api_app.h

@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 

atom/browser/api/atom_api_browser_window.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/api/atom_api_browser_window.h"
 
+#include <memory>
+
 #include "atom/browser/browser.h"
 #include "atom/browser/unresponsive_suppressor.h"
 #include "atom/browser/web_contents_preferences.h"

atom/browser/api/atom_api_browser_window.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
 #define ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/browser/api/atom_api_cookies.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/api/atom_api_cookies.h"
 
+#include <memory>
+#include <utility>
+
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/request_context_delegate.h"
 #include "atom/common/native_mate_converters/callback.h"

atom/browser/api/atom_api_cookies.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_COOKIES_H_
 #define ATOM_BROWSER_API_ATOM_API_COOKIES_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/api/trackable_object.h"

atom/browser/api/atom_api_debugger.cc

@@ -4,7 +4,9 @@
 
 #include "atom/browser/api/atom_api_debugger.h"
 
+#include <memory>
 #include <string>
+#include <utility>
 
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/value_converter.h"

atom/browser/api/atom_api_desktop_capturer.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/api/atom_api_desktop_capturer.h"
 
+#include <memory>
+#include <utility>
 #include <vector>
 
 using base::PlatformThreadRef;

atom/browser/api/atom_api_desktop_capturer.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
 #define ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/api/event_emitter.h"

atom/browser/api/atom_api_menu_views.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/api/atom_api_menu_views.h"
 
+#include <memory>
+
 #include "atom/browser/native_window_views.h"
 #include "atom/browser/unresponsive_suppressor.h"
 #include "ui/display/screen.h"

atom/browser/api/atom_api_menu_views.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
 
 #include <map>
+#include <memory>
 
 #include "atom/browser/api/atom_api_menu.h"
 #include "base/memory/weak_ptr.h"

atom/browser/api/atom_api_net_log.cc

@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "atom/browser/api/atom_api_net_log.h"
+
+#include <utility>
+
 #include "atom/browser/atom_browser_client.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"

atom/browser/api/atom_api_protocol.h

@@ -6,7 +6,9 @@
 #define ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
 
 #include <map>
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/browser/api/trackable_object.h"

atom/browser/api/atom_api_session.cc

@@ -5,7 +5,9 @@
 #include "atom/browser/api/atom_api_session.h"
 
 #include <map>
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/browser/api/atom_api_cookies.h"

atom/browser/api/atom_api_system_preferences.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
 #define ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/api/event_emitter.h"

atom/browser/api/atom_api_web_contents.cc

@@ -4,8 +4,10 @@
 
 #include "atom/browser/api/atom_api_web_contents.h"
 
+#include <memory>
 #include <set>
 #include <string>
+#include <utility>
 
 #include "atom/browser/api/atom_api_browser_window.h"
 #include "atom/browser/api/atom_api_debugger.h"

atom/browser/api/atom_api_web_contents.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
 #define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/browser/api/atom_api_web_request.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/api/atom_api_web_request.h"
 
 #include <string>
+#include <utility>
 
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/net/atom_network_delegate.h"

atom/browser/api/event_subscriber.cc

@@ -1,9 +1,12 @@
 // Copyright (c) 2017 GitHub, Inc.
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
-#include <string>
 
 #include "atom/browser/api/event_subscriber.h"
+
+#include <string>
+#include <utility>
+
 #include "atom/common/native_mate_converters/callback.h"
 
 namespace {

atom/browser/api/event_subscriber.h

@@ -6,7 +6,9 @@
 #define ATOM_BROWSER_API_EVENT_SUBSCRIBER_H_
 
 #include <map>
+#include <memory>
 #include <string>
+#include <utility>
 
 #include "atom/common/api/event_emitter_caller.h"
 #include "base/synchronization/lock.h"

atom/browser/api/trackable_object.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/api/trackable_object.h"
 
+#include <memory>
+
 #include "atom/browser/atom_browser_main_parts.h"
 #include "base/bind.h"
 #include "base/supports_user_data.h"

atom/browser/atom_blob_reader.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/atom_blob_reader.h"
 
+#include <utility>
+
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"

atom/browser/atom_blob_reader.h

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

atom/browser/atom_browser_client.cc

@@ -8,6 +8,9 @@
 #include <shlobj.h>
 #endif
 
+#include <memory>
+#include <utility>
+
 #include "atom/browser/api/atom_api_app.h"
 #include "atom/browser/api/atom_api_protocol.h"
 #include "atom/browser/api/atom_api_web_contents.h"
@@ -28,6 +31,7 @@
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
+#include "base/no_destructor.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ -82,7 +86,7 @@ namespace {
 bool g_suppress_renderer_process_restart = false;
 
 // Custom schemes to be registered to handle service worker.
-std::string g_custom_service_worker_schemes = "";
+base::NoDestructor<std::string> g_custom_service_worker_schemes;
 
 bool IsSameWebSite(content::BrowserContext* browser_context,
                    const GURL& src_url,
@@ -105,7 +109,7 @@ void AtomBrowserClient::SuppressRendererProcessRestartForOnce() {
 
 void AtomBrowserClient::SetCustomServiceWorkerSchemes(
     const std::vector<std::string>& schemes) {
-  g_custom_service_worker_schemes = base::JoinString(schemes, ",");
+  *g_custom_service_worker_schemes = base::JoinString(schemes, ",");
 }
 
 AtomBrowserClient::AtomBrowserClient() {}
@@ -326,9 +330,9 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
                                  arraysize(kCommonSwitchNames));
 
   // The registered service worker schemes.
-  if (!g_custom_service_worker_schemes.empty())
+  if (!g_custom_service_worker_schemes->empty())
     command_line->AppendSwitchASCII(switches::kRegisterServiceWorkerSchemes,
-                                    g_custom_service_worker_schemes);
+                                    *g_custom_service_worker_schemes);
 
 #if defined(OS_WIN)
   // Append --app-user-model-id.

atom/browser/atom_browser_client.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>

atom/browser/atom_browser_context.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
 #define ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/browser/atom_browser_main_parts.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/atom_browser_main_parts.h"
 
+#include <utility>
+
 #include "atom/browser/api/atom_api_app.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/atom_browser_client.h"

atom/browser/atom_browser_main_parts.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
 
 #include <list>
+#include <memory>
 #include <string>
 
 #include "base/callback.h"

atom/browser/atom_javascript_dialog_manager.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/atom_javascript_dialog_manager.h"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/browser/api/atom_api_web_contents.h"

atom/browser/atom_permission_manager.cc

@@ -4,6 +4,7 @@
 
 #include "atom/browser/atom_permission_manager.h"
 
+#include <memory>
 #include <vector>
 
 #include "atom/browser/atom_browser_client.h"

atom/browser/atom_permission_manager.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_ATOM_PERMISSION_MANAGER_H_
 
 #include <map>
+#include <memory>
 #include <vector>
 
 #include "base/callback.h"

atom/browser/atom_speech_recognition_manager_delegate.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/atom_speech_recognition_manager_delegate.h"
 
 #include <string>
+#include <utility>
 
 #include "base/callback.h"
 

atom/browser/bridge_task_runner.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/bridge_task_runner.h"
 
+#include <utility>
+
 #include "base/message_loop/message_loop.h"
 
 namespace atom {

atom/browser/browser.cc

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

atom/browser/browser.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_BROWSER_H_
 #define ATOM_BROWSER_BROWSER_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/browser/common_web_contents_delegate.cc

@@ -4,8 +4,10 @@
 
 #include "atom/browser/common_web_contents_delegate.h"
 
+#include <memory>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/browser/atom_browser_context.h"

atom/browser/common_web_contents_delegate.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 

atom/browser/lib/power_observer_linux.cc

@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <uv.h>
 #include <iostream>
+#include <utility>
 
 #include "base/bind.h"
 #include "device/bluetooth/dbus/dbus_thread_manager_linux.h"

atom/browser/loader/layered_resource_handler.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/loader/layered_resource_handler.h"
 
+#include <memory>
+#include <utility>
+
 namespace atom {
 
 LayeredResourceHandler::LayeredResourceHandler(

atom/browser/loader/layered_resource_handler.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
 #define ATOM_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
 
+#include <memory>
+
 #include "content/browser/loader/layered_resource_handler.h"
 #include "services/network/public/cpp/resource_response.h"
 

atom/browser/login_handler.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/login_handler.h"
 
+#include <memory>
+#include <utility>
+
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "base/values.h"

atom/browser/native_window_mac.h

@@ -7,6 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/browser/native_window_views.cc

@@ -9,6 +9,8 @@
 #include <wrl/client.h>
 #endif
 
+#include <memory>
+#include <utility>
 #include <vector>
 
 #include "atom/browser/api/atom_api_web_contents.h"

atom/browser/native_window_views.h

@@ -7,6 +7,7 @@
 
 #include "atom/browser/native_window.h"
 
+#include <memory>
 #include <set>
 #include <string>
 

atom/browser/net/asar/url_request_asar_job.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/net/asar/url_request_asar_job.h"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/common/asar/archive.h"

atom/browser/net/atom_cert_verifier.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/net/atom_cert_verifier.h"
 
+#include <utility>
+
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "base/containers/linked_list.h"

atom/browser/net/atom_network_delegate.cc

@@ -4,6 +4,7 @@
 
 #include "atom/browser/net/atom_network_delegate.h"
 
+#include <memory>
 #include <utility>
 
 #include "atom/browser/api/atom_api_web_contents.h"

atom/browser/net/atom_network_delegate.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>

atom/browser/net/atom_url_request.cc

@@ -4,7 +4,11 @@
 // found in the LICENSE file.
 
 #include "atom/browser/net/atom_url_request.h"
+
 #include <string>
+#include <memory>
+#include <utility>
+
 #include "atom/browser/api/atom_api_url_request.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"

atom/browser/net/atom_url_request.h

@@ -7,7 +7,9 @@
 #define ATOM_BROWSER_NET_ATOM_URL_REQUEST_H_
 
 #include <string>
+#include <memory>
 #include <vector>
+
 #include "atom/browser/api/atom_api_url_request.h"
 #include "atom/browser/atom_browser_context.h"
 #include "base/memory/ref_counted.h"

atom/browser/net/js_asker.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/net/js_asker.h"
 
+#include <memory>
+#include <utility>
 #include <vector>
 
 #include "atom/common/native_mate_converters/callback.h"

atom/browser/net/js_asker.h

@@ -5,6 +5,9 @@
 #ifndef ATOM_BROWSER_NET_JS_ASKER_H_
 #define ATOM_BROWSER_NET_JS_ASKER_H_
 
+#include <memory>
+#include <utility>
+
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"

atom/browser/net/url_request_async_asar_job.cc

@@ -4,6 +4,7 @@
 
 #include "atom/browser/net/url_request_async_asar_job.h"
 
+#include <memory>
 #include <string>
 
 #include "atom/common/atom_constants.h"

atom/browser/net/url_request_async_asar_job.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
 #define ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
 
+#include <memory>
+
 #include "atom/browser/net/asar/url_request_asar_job.h"
 #include "atom/browser/net/js_asker.h"
 

atom/browser/net/url_request_buffer_job.cc

@@ -4,6 +4,7 @@
 
 #include "atom/browser/net/url_request_buffer_job.h"
 
+#include <memory>
 #include <string>
 
 #include "atom/common/atom_constants.h"

atom/browser/net/url_request_buffer_job.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
 #define ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/net/js_asker.h"

atom/browser/net/url_request_fetch_job.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/net/url_request_fetch_job.h"
 
 #include <algorithm>
+#include <memory>
 #include <string>
 
 #include "atom/browser/api/atom_api_session.h"

atom/browser/net/url_request_fetch_job.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
 #define ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/net/js_asker.h"

atom/browser/net/url_request_stream_job.cc

@@ -2,11 +2,14 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
+#include "atom/browser/net/url_request_stream_job.h"
+
 #include <algorithm>
+#include <memory>
 #include <ostream>
 #include <string>
+#include <utility>
 
-#include "atom/browser/net/url_request_stream_job.h"
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/atom_constants.h"
 #include "atom/common/native_mate_converters/net_converter.h"

atom/browser/net/url_request_stream_job.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
 
 #include <deque>
+#include <memory>
 #include <string>
 
 #include "atom/browser/api/event_subscriber.h"

atom/browser/net/url_request_string_job.cc

@@ -4,6 +4,7 @@
 
 #include "atom/browser/net/url_request_string_job.h"
 
+#include <memory>
 #include <string>
 
 #include "atom/common/atom_constants.h"

atom/browser/net/url_request_string_job.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
 #define ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/net/js_asker.h"

atom/browser/osr/osr_output_device.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
 #define ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
 
+#include <memory>
+
 #include "base/callback.h"
 #include "components/viz/service/display/software_output_device.h"
 #include "third_party/skia/include/core/SkBitmap.h"

atom/browser/osr/osr_render_widget_host_view.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
 #define ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
 
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>

atom/browser/osr/osr_view_proxy.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_OSR_OSR_VIEW_PROXY_H_
 #define ATOM_BROWSER_OSR_OSR_VIEW_PROXY_H_
 
+#include <memory>
 #include <set>
 
 #include "third_party/skia/include/core/SkBitmap.h"

atom/browser/relauncher.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/relauncher.h"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/common/atom_command_line.h"

atom/browser/request_context_delegate.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/request_context_delegate.h"
 
+#include <memory>
+#include <utility>
+
 #include "atom/browser/api/atom_api_protocol.h"
 #include "atom/browser/net/about_protocol_handler.h"
 #include "atom/browser/net/asar/asar_protocol_handler.h"

atom/browser/request_context_delegate.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_REQUEST_CONTEXT_DELEGATE_H_
 #define ATOM_BROWSER_REQUEST_CONTEXT_DELEGATE_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/browser/ui/tray_icon_gtk.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
 #define ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/ui/tray_icon.h"

atom/browser/ui/views/autofill_popup_view.cc

@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "atom/browser/ui/views/autofill_popup_view.h"
+
+#include <memory>
+
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "cc/paint/skia_paint_canvas.h"

atom/browser/ui/views/autofill_popup_view.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
 #define ATOM_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
 
+#include <memory>
+
 #include "atom/browser/ui/autofill_popup.h"
 
 #if defined(ENABLE_OSR)

atom/browser/ui/views/menu_bar.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/ui/views/menu_bar.h"
 
+#include <memory>
+
 #include "atom/browser/ui/views/menu_delegate.h"
 #include "atom/browser/ui/views/submenu_button.h"
 #include "ui/base/models/menu_model.h"

atom/browser/ui/views/submenu_button.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/ui/views/submenu_button.h"
 
+#include <memory>
+#include <utility>
+
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"

atom/browser/ui/views/submenu_button.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
 #define ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
 
+#include <memory>
+
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/controls/button/menu_button.h"
 

atom/browser/ui/webui/pdf_viewer_handler.cc

@@ -4,6 +4,9 @@
 
 #include "atom/browser/ui/webui/pdf_viewer_handler.h"
 
+#include <memory>
+#include <utility>
+
 #include "atom/common/atom_constants.h"
 #include "base/bind.h"
 #include "base/values.h"

atom/browser/ui/webui/pdf_viewer_handler.h

@@ -9,6 +9,7 @@
 #error("This header can only be used when enable_pdf_viewer gyp flag is enabled")  // NOLINT
 #endif  // defined(ENABLE_PDF_VIEWER)
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/web_contents_zoom_controller.h"

atom/browser/ui/webui/pdf_viewer_ui.cc

@@ -5,6 +5,8 @@
 #include "atom/browser/ui/webui/pdf_viewer_ui.h"
 
 #include <map>
+#include <memory>
+#include <utility>
 
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/loader/layered_resource_handler.h"

atom/browser/ui/webui/pdf_viewer_ui.h

@@ -9,6 +9,7 @@
 #error("This header can only be used when enable_pdf_viewer gyp flag is enabled")  // NOLINT
 #endif  // defined(ENABLE_PDF_VIEWER)
 
+#include <memory>
 #include <string>
 
 #include "base/macros.h"

atom/browser/ui/win/notify_icon.h

@@ -9,6 +9,7 @@
 
 #include <shellapi.h>
 
+#include <memory>
 #include <string>
 
 #include "atom/browser/ui/tray_icon.h"

atom/browser/ui/x/event_disabler.cc

@@ -4,6 +4,8 @@
 
 #include "atom/browser/ui/x/event_disabler.h"
 
+#include <memory>
+
 namespace atom {
 
 EventDisabler::EventDisabler() {}

atom/browser/ui/x/event_disabler.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_UI_X_EVENT_DISABLER_H_
 #define ATOM_BROWSER_UI_X_EVENT_DISABLER_H_
 
+#include <memory>
+
 #include "base/macros.h"
 #include "ui/events/event_rewriter.h"
 

atom/browser/ui/x/x_window_utils.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/ui/x/x_window_utils.h"
 
 #include <X11/Xatom.h>
+#include <memory>
 
 #include "base/environment.h"
 #include "base/strings/string_util.h"

atom/browser/web_contents_preferences.cc

@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/browser/native_window.h"

atom/common/api/atom_api_native_image.cc

@@ -4,7 +4,9 @@
 
 #include "atom/common/api/atom_api_native_image.h"
 
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/common/asar/asar_util.h"

atom/common/api/atom_bindings.h

@@ -6,6 +6,7 @@
 #define ATOM_COMMON_API_ATOM_BINDINGS_H_
 
 #include <list>
+#include <memory>
 
 #include "base/macros.h"
 #include "base/process/process_metrics.h"

atom/common/asar/archive.cc

@@ -5,6 +5,7 @@
 #include "atom/common/asar/archive.h"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "atom/common/asar/scoped_temporary_file.h"

atom/common/crash_reporter/crash_reporter_mac.h

@@ -6,6 +6,7 @@
 #define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 

atom/common/native_mate_converters/net_converter.cc

@@ -5,6 +5,8 @@
 #include "atom/common/native_mate_converters/net_converter.h"
 
 #include <string>
+#include <memory>
+#include <utility>
 #include <vector>
 
 #include "atom/common/native_mate_converters/gurl_converter.h"

atom/common/native_mate_converters/network_converter.cc

@@ -4,6 +4,7 @@
 
 #include "atom/common/native_mate_converters/network_converter.h"
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>

atom/common/native_mate_converters/value_converter.cc

@@ -4,6 +4,8 @@
 
 #include "atom/common/native_mate_converters/value_converter.h"
 
+#include <memory>
+
 #include "atom/common/native_mate_converters/v8_value_converter.h"
 #include "base/values.h"
 

atom/common/node_bindings.cc

@@ -5,6 +5,7 @@
 #include "atom/common/node_bindings.h"
 
 #include <algorithm>
+#include <memory>
 #include <string>
 #include <vector>
 

atom/renderer/api/atom_api_spell_check_client.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
 #define ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 

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 <memory>
 #include <set>
 #include <string>
 #include <vector>

atom/renderer/atom_sandboxed_renderer_client.cc

@@ -30,8 +30,8 @@ namespace atom {
 
 namespace {
 
-const std::string kIpcKey = "ipcNative";
+const char kIpcKey[] = "ipcNative";
-const std::string kModuleCacheKey = "native-module-cache";
+const char kModuleCacheKey[] = "native-module-cache";
 
 bool IsDevTools(content::RenderFrame* render_frame) {
   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(

atom/renderer/atom_sandboxed_renderer_client.h

@@ -4,6 +4,7 @@
 #ifndef ATOM_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
 #define ATOM_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/renderer/guest_view_container.cc

@@ -5,6 +5,7 @@
 #include "atom/renderer/guest_view_container.h"
 
 #include <map>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"

atom/renderer/renderer_client_base.cc

@@ -4,6 +4,7 @@
 
 #include "atom/renderer/renderer_client_base.h"
 
+#include <memory>
 #include <string>
 #include <vector>
 

atom/renderer/renderer_client_base.h

@@ -5,6 +5,7 @@
 #ifndef ATOM_RENDERER_RENDERER_CLIENT_BASE_H_
 #define ATOM_RENDERER_RENDERER_CLIENT_BASE_H_
 
+#include <memory>
 #include <string>
 #include <vector>