Require explicit selection of traits for LazyInstance

chrome/test/chromedriver/session.cc

 // Copyright (c) 2012 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/test/chromedriver/session.h"
 
 #include <list>
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/chrome.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/web_view.h"
 #include "chrome/test/chromedriver/logging.h"
 
 namespace {
 
-base::LazyInstance<base::ThreadLocalPointer<Session> >
+base::LazyInstance<base::ThreadLocalPointer<Session>>::DestructorAtExit
     lazy_tls_session = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 FrameInfo::FrameInfo(const std::string& parent_frame_id,
                      const std::string& frame_id,
                      const std::string& chromedriver_frame_id)
     : parent_frame_id(parent_frame_id),
       frame_id(frame_id),
       chromedriver_frame_id(chromedriver_frame_id) {}
@@ skipping 84 matching lines @@
   return std::string();
 }
 
 Session* GetThreadLocalSession() {
   return lazy_tls_session.Pointer()->Get();
 }
 
 void SetThreadLocalSession(std::unique_ptr<Session> session) {
   lazy_tls_session.Pointer()->Set(session.release());
 }