Require explicit selection of traits for LazyInstance

components/cronet/histogram_manager.h

 // 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.
 
 #ifndef COMPONENTS_CRONET_HISTOGRAM_MANAGER_H_
 #define COMPONENTS_CRONET_HISTOGRAM_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 19 matching lines @@
 
   // Snapshot all histograms to record the delta into |uma_proto_| and then
   // returns the serialized protobuf representation of the record in |data|.
   // Returns true if it was successfully serialized.
   bool GetDeltas(std::vector<uint8_t>* data);
 
   // TODO(mef): Hang Histogram Manager off java object instead of singleton.
   static HistogramManager* GetInstance();
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<HistogramManager>;
+  friend struct base::LazyInstanceTraitsBase<HistogramManager>;
 
   // base::HistogramFlattener:
   void RecordDelta(const base::HistogramBase& histogram,
                    const base::HistogramSamples& snapshot) override;
   void InconsistencyDetected(
       base::HistogramBase::Inconsistency problem) override;
   void UniqueInconsistencyDetected(
       base::HistogramBase::Inconsistency problem) override;
   void InconsistencyDetectedInLoggedCount(int amount) override;
 
   base::HistogramSnapshotManager histogram_snapshot_manager_;
 
   // Stores the protocol buffer representation for this log.
   metrics::ChromeUserMetricsExtension uma_proto_;
 
   // Should be acquired whenever GetDeltas() is executing to maintain
   // thread-safety.
   base::Lock get_deltas_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(HistogramManager);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_HISTOGRAM_MANAGER_H_