From e2fe95894fe2f3e4caf7f2f72e0ab031ff47a5cf Mon Sep 17 00:00:00 2001
From: Aleksei Kuzmin <alkuzmin@microsoft.com>
Date: Tue, 20 Jun 2017 22:14:39 +0300
Subject: [PATCH] Require explicit selection of traits for LazyInstance

https://codereview.chromium.org/2733283002
---
 atom/renderer/guest_view_container.cc                         | 4 ++--
 atom/renderer/web_worker_observer.cc                          | 4 ++--
 chromium_src/chrome/common/chrome_paths.cc                    | 2 +-
 .../chrome/renderer/pepper/pepper_flash_renderer_host.cc      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/atom/renderer/guest_view_container.cc b/atom/renderer/guest_view_container.cc
index 82bcc862563..c2c8c00df88 100644
--- a/atom/renderer/guest_view_container.cc
+++ b/atom/renderer/guest_view_container.cc
@@ -16,8 +16,8 @@ namespace atom {
 namespace {
 
 using GuestViewContainerMap = std::map<int, GuestViewContainer*>;
-static base::LazyInstance<GuestViewContainerMap> g_guest_view_container_map =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<GuestViewContainerMap>::DestructorAtExit
+    g_guest_view_container_map = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
diff --git a/atom/renderer/web_worker_observer.cc b/atom/renderer/web_worker_observer.cc
index 954b2f23614..0736f4e69fe 100644
--- a/atom/renderer/web_worker_observer.cc
+++ b/atom/renderer/web_worker_observer.cc
@@ -17,8 +17,8 @@ namespace atom {
 
 namespace {
 
-static base::LazyInstance<base::ThreadLocalPointer<WebWorkerObserver>>
-    lazy_tls = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<base::ThreadLocalPointer<WebWorkerObserver>>::
+    DestructorAtExit lazy_tls = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
diff --git a/chromium_src/chrome/common/chrome_paths.cc b/chromium_src/chrome/common/chrome_paths.cc
index 009953ff5a3..f1f4e57ba01 100644
--- a/chromium_src/chrome/common/chrome_paths.cc
+++ b/chromium_src/chrome/common/chrome_paths.cc
@@ -68,7 +68,7 @@ const base::FilePath::CharType kComponentUpdatedFlashHint[] =
     FILE_PATH_LITERAL("latest-component-updated-flash");
 #endif  // defined(OS_LINUX)
 
-static base::LazyInstance<base::FilePath>
+static base::LazyInstance<base::FilePath>::DestructorAtExit
     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
 
 // Gets the path for internal plugins.
diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
index 09e5b46df6f..f9384bbaea9 100644
--- a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -97,8 +97,8 @@ enum FlashNavigateUsage {
   FLASH_NAVIGATE_USAGE_ENUM_COUNT
 };
 
-static base::LazyInstance<std::map<std::string, FlashNavigateUsage> >
-    g_rejected_headers = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<std::map<std::string, FlashNavigateUsage> >::
+    DestructorAtExit g_rejected_headers = LAZY_INSTANCE_INITIALIZER;
 
 bool IsSimpleHeader(const std::string& lower_case_header_name,
                     const std::string& header_value) {