Require explicit selection of traits for LazyInstance

chrome/browser/android/webapps/single_tab_mode_tab_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/android/tab_android.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SingleTabModeTabHelper);
 
 namespace {
 
 typedef std::pair<int32_t, int32_t> RenderFrameHostID;
 typedef std::set<RenderFrameHostID> SingleTabIDSet;
-base::LazyInstance<SingleTabIDSet> g_blocked_ids = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<SingleTabIDSet>::DestructorAtExit g_blocked_ids =
+    LAZY_INSTANCE_INITIALIZER;
 
 void AddPairOnIOThread(int32_t process_id, int32_t frame_routing_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   RenderFrameHostID single_tab_pair(process_id, frame_routing_id);
   g_blocked_ids.Get().insert(single_tab_pair);
 }
 
 void RemovePairOnIOThread(int32_t process_id, int32_t frame_routing_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   RenderFrameHostID single_tab_pair(process_id, frame_routing_id);
@@ skipping 65 matching lines @@
 
 void SingleTabModeTabHelper::HandleOpenUrl(const BlockedWindowParams& params) {
   TabAndroid* tab = TabAndroid::FromWebContents(web_contents());
   if (!tab)
     return;
 
   chrome::NavigateParams nav_params =
       params.CreateNavigateParams(web_contents());
   tab->HandlePopupNavigation(&nav_params);
 }