Require explicit selection of traits for LazyInstance

chrome/browser/android/bookmarks/partner_bookmarks_shim.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/bookmarks/partner_bookmarks_shim.h"
 
 #include <tuple>
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
@@ skipping 17 matching lines @@
 // PartnerBookmarksShim is responsible to applying and storing the user changes
 // (deletions/renames) in the user profile, thus keeping the hierarchy intact.
 struct PartnerModelKeeper {
   std::unique_ptr<BookmarkNode> partner_bookmarks_root;
   bool loaded;
 
   PartnerModelKeeper()
     : loaded(false) {}
 };
 
-base::LazyInstance<PartnerModelKeeper> g_partner_model_keeper =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<PartnerModelKeeper>::DestructorAtExit
+    g_partner_model_keeper = LAZY_INSTANCE_INITIALIZER;
 
 const void* const kPartnerBookmarksShimUserDataKey =
     &kPartnerBookmarksShimUserDataKey;
 
 // Dictionary keys for entries in the kPartnerBookmarksMapping pref.
 const char kMappingUrl[] = "url";
 const char kMappingProviderTitle[] = "provider_title";
 const char kMappingTitle[] = "mapped_title";
 
 bool g_disable_partner_bookmarks_editing = false;
@@ skipping 233 matching lines @@
        i != node_rename_remove_map_.end();
        ++i) {
     base::DictionaryValue* dict = new base::DictionaryValue();
     dict->SetString(kMappingUrl, i->first.url().spec());
     dict->SetString(kMappingProviderTitle, i->first.provider_title());
     dict->SetString(kMappingTitle, i->second);
     list.Append(dict);
   }
   prefs_->Set(prefs::kPartnerBookmarkMappings, list);
 }