Require explicit selection of traits for LazyInstance

chrome/browser/ui/webui/print_preview/print_preview_ui.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/ui/webui/print_preview/print_preview_ui.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
@@ skipping 89 matching lines @@
   // Mapping from PrintPreviewUI ID to print preview request ID.
   typedef std::map<int, int> PrintPreviewRequestIdMap;
 
   PrintPreviewRequestIdMap map_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewRequestIdMapWithLock);
 };
 
 // Written to on the UI thread, read from any thread.
-base::LazyInstance<PrintPreviewRequestIdMapWithLock>
+base::LazyInstance<PrintPreviewRequestIdMapWithLock>::DestructorAtExit
     g_print_preview_request_id_map = LAZY_INSTANCE_INITIALIZER;
 
 // PrintPreviewUI IDMap used to avoid exposing raw pointer addresses to WebUI.
 // Only accessed on the UI thread.
-base::LazyInstance<IDMap<PrintPreviewUI*>> g_print_preview_ui_id_map =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<IDMap<PrintPreviewUI*>>::DestructorAtExit
+    g_print_preview_ui_id_map = LAZY_INSTANCE_INITIALIZER;
 
 // PrintPreviewUI serves data for chrome://print requests.
 //
 // The format for requesting PDF data is as follows:
 // chrome://print/<PrintPreviewUIID>/<PageIndex>/print.pdf
 //
 // Parameters (< > required):
 //    <PrintPreviewUIID> = PrintPreview UI ID
 //    <PageIndex> = Page index is zero-based or
 //                  |printing::COMPLETE_PREVIEW_DOCUMENT_INDEX| to represent
@@ skipping 568 matching lines @@
 }
 
 void PrintPreviewUI::SetSelectedFileForTesting(const base::FilePath& path) {
   handler_->FileSelected(path, 0, NULL);
 }
 
 void PrintPreviewUI::SetPdfSavedClosureForTesting(
     const base::Closure& closure) {
   handler_->SetPdfSavedClosureForTesting(closure);
 }