Move histogram_manager from components/metrics to components/cronet

components/cronet/histogram_manager_unittest.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_manager.h"
+#include "components/cronet/histogram_manager.h"
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/metrics/statistics_recorder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace metrics {
+namespace cronet {
 
-// TODO(mef): crbug.com/441441. Move components/metrics/histogram_manager.*
-// files into components/android/cronet.
+using metrics::ChromeUserMetricsExtension;
+using metrics::HistogramEventProto;
+
 // TODO(rtenneti): enable flaky HistogramBucketFields unit test.

[ramant (doing other things), 2015/04/09 00:10:22]

nit: Would appreciate if you could delete the TODO. Many thanks for fixing this.

[mef, 2015/04/09 00:41:40]

Done.

-TEST(HistogramManager, DISABLED_HistogramBucketFields) {
+TEST(HistogramManager, HistogramBucketFields) {
+  base::StatisticsRecorder::Initialize();
   // Capture histograms at the start of the test to avoid later GetDeltas()
   // calls picking them up.
   std::vector<uint8> data_init;
   HistogramManager::GetInstance()->GetDeltas(&data_init);
 
   // kNoFlags filter should record all histograms.
   UMA_HISTOGRAM_ENUMERATION("UmaHistogramManager", 1, 2);
 
   std::vector<uint8> data;
   EXPECT_TRUE(HistogramManager::GetInstance()->GetDeltas(&data));
@@ skipping 20 matching lines @@
   EXPECT_FALSE(data2.empty());
 
   const HistogramEventProto& histogram_proto2 =
       uma_proto2.histogram_event(uma_proto2.histogram_event_size() - 1);
   ASSERT_EQ(1, histogram_proto2.bucket_size());
   EXPECT_LE(0, histogram_proto2.bucket(0).min());
   EXPECT_LE(3, histogram_proto2.bucket(0).max());
   EXPECT_EQ(1, histogram_proto2.bucket(0).count());
 }
 
-}  // namespace metrics
+}  // namespace cronet