Require explicit selection of traits for LazyInstance

chrome/browser/first_run/first_run.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/browser/first_run/first_run.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 421 matching lines @@
 
   // Reset the preference and notifications to avoid showing the bubble again.
   prefs->SetInteger(prefs::kShowFirstRunBubbleOption,
                     first_run::FIRST_RUN_BUBBLE_DONT_SHOW);
 
   // Show the bubble now and destroy this bubble launcher.
   browser->ShowFirstRunBubble();
   delete this;
 }
 
-static base::LazyInstance<base::FilePath> master_prefs_path_for_testing
-    = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<base::FilePath>::DestructorAtExit
+    master_prefs_path_for_testing = LAZY_INSTANCE_INITIALIZER;
 
 // Loads master preferences from the master preference file into the installer
 // master preferences. Returns the pointer to installer::MasterPreferences
 // object if successful; otherwise, returns NULL.
 installer::MasterPreferences* LoadMasterPrefs() {
   base::FilePath master_prefs_path;
   if (!master_prefs_path_for_testing.Get().empty()) {
     master_prefs_path = master_prefs_path_for_testing.Get();
   } else {
     master_prefs_path = base::FilePath(first_run::internal::MasterPrefsPath());
@@ skipping 396 matching lines @@
   SetShouldDoPersonalDataManagerFirstRun();
 
   internal::DoPostImportPlatformSpecificTasks(profile);
 }
 
 uint16_t auto_import_state() {
   return g_auto_import_state;
 }
 
 }  // namespace first_run