Reorganize histograms for persistence.

components/metrics/histogram_encoder.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 "components/metrics/histogram_encoder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
-#include "components/metrics/metrics_hashes.h"
+#include "base/metrics/metrics_hashes.h"
 
 using base::SampleCountIterator;
 
 namespace metrics {
 
 void EncodeHistogramDelta(const std::string& histogram_name,
                           const base::HistogramSamples& snapshot,
                           ChromeUserMetricsExtension* uma_proto) {
   DCHECK_NE(0, snapshot.TotalCount());
   DCHECK(uma_proto);
@@ skipping 22 matching lines @@
     if (i + 1 < histogram_proto->bucket_size() &&
         bucket->max() == histogram_proto->bucket(i + 1).min()) {
       bucket->clear_max();
     } else if (bucket->max() == bucket->min() + 1) {
       bucket->clear_min();
     }
   }
 }
 
 }  // namespace metrics