Require explicit selection of traits for LazyInstance

chromecast/base/metrics/grouped_histogram.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 "chromecast/base/metrics/grouped_histogram.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/lazy_instance.h"
@@ skipping 11 matching lines @@
 namespace {
 
 const char kAppNameErrorNoApp[] = "ERROR_NO_APP_REGISTERED";
 
 // Current app name guarded by lock.
 struct CurrentAppNameWithLock {
   base::Lock lock;
   std::string app_name;
 };
 
-base::LazyInstance<CurrentAppNameWithLock> g_current_app =
+base::LazyInstance<CurrentAppNameWithLock>::DestructorAtExit g_current_app =
     LAZY_INSTANCE_INITIALIZER;
 
 std::string GetAppName() {
   base::AutoLock lock(g_current_app.Get().lock);
   const std::string& app_name = g_current_app.Get().app_name;
   return app_name.empty() ? kAppNameErrorNoApp : app_name;
 }
 
 struct HistogramArgs {
   const char* name;
@@ skipping 132 matching lines @@
   }
 }
 
 void TagAppStartForGroupedHistograms(const std::string& app_name) {
   base::AutoLock lock(g_current_app.Get().lock);
   g_current_app.Get().app_name = app_name;
 }
 
 } // namespace metrics
 } // namespace chromecast