Require explicit selection of traits for LazyInstance

content/public/test/browser_side_navigation_test_utils.cc

 // Copyright 2014 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 "content/public/test/browser_side_navigation_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 24 matching lines @@
   ~BrowserSideNavigationTestUtils() {}
   StreamRegistry* stream_registry() { return stream_registry_.get();}
 
  private:
   std::unique_ptr<StreamRegistry> stream_registry_;
   std::unique_ptr<TestNavigationURLLoaderFactory> loader_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserSideNavigationTestUtils);
 };
 
-base::LazyInstance<std::unique_ptr<BrowserSideNavigationTestUtils>>
-    browser_side_navigation_test_utils;
+base::LazyInstance<std::unique_ptr<BrowserSideNavigationTestUtils>>::
+    DestructorAtExit browser_side_navigation_test_utils;
 
 }  // namespace
 
 void BrowserSideNavigationSetUp() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_side_navigation_test_utils.Get().reset(
       new BrowserSideNavigationTestUtils);
 }
 
 void BrowserSideNavigationTearDown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_side_navigation_test_utils.Get().reset(nullptr);
 }
 
 std::unique_ptr<StreamHandle> MakeEmptyStream() {
   GURL url(std::string(url::kBlobScheme) + "://" + base::GenerateGUID());
   StreamRegistry* stream_registry =
       browser_side_navigation_test_utils.Get()->stream_registry();
   scoped_refptr<Stream> stream(new Stream(stream_registry, NULL, url));
   stream->Finalize(net::OK);
   return stream->CreateHandle();
 }
 
 void EnableBrowserSideNavigation() {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableBrowserSideNavigation);
 }
 
 }  // namespace content