Move part of metrics from chrome/common to components

components/metrics/metrics_log_base_unittest.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/common/metrics/metrics_log_base.h"
+#include "components/metrics/metrics_log_base.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/metrics/bucket_ranges.h"
 #include "base/metrics/sample_vector.h"
-#include "chrome/common/metrics/proto/chrome_user_metrics_extension.pb.h"
+#include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace metrics {
+
 namespace {
 
 class TestMetricsLogBase : public MetricsLogBase {
  public:
   TestMetricsLogBase()
       : MetricsLogBase("client_id", 1, MetricsLogBase::ONGOING_LOG, "1.2.3.4") {
   }
   virtual ~TestMetricsLogBase() {}
 
   using MetricsLogBase::uma_proto;
@@ skipping 25 matching lines @@
   // for the expected output.
   metrics::ChromeUserMetricsExtension parsed;
   ASSERT_TRUE(parsed.ParseFromString(encoded));
 
   metrics::ChromeUserMetricsExtension expected;
   expected.set_client_id(5217101509553811875);  // Hashed bogus client ID
   expected.set_session_id(137);
   expected.mutable_system_profile()->set_build_timestamp(
       parsed.system_profile().build_timestamp());
   expected.mutable_system_profile()->set_app_version("bogus version");
-  expected.mutable_system_profile()->set_channel(
-      parsed.system_profile().channel());
   expected.mutable_system_profile()->mutable_hardware()->set_hardware_class(
       "sample-class");
 
   EXPECT_EQ(expected.SerializeAsString(), encoded);
 }
 
 TEST(MetricsLogBaseTest, HistogramBucketFields) {
   // Create buckets: 1-5, 5-7, 7-8, 8-9, 9-10, 10-11, 11-12.
   base::BucketRanges ranges(8);
   ranges.set_range(0, 1);
   ranges.set_range(1, 5);
   ranges.set_range(2, 7);
   ranges.set_range(3, 8);
   ranges.set_range(4, 9);
   ranges.set_range(5, 10);
   ranges.set_range(6, 11);
   ranges.set_range(7, 12);
 
   base::SampleVector samples(&ranges);
-  samples.Accumulate(3, 1);  // Bucket 1-5.
-  samples.Accumulate(6, 1);  // Bucket 5-7.
-  samples.Accumulate(8, 1);  // Bucket 8-9. (7-8 skipped)
+  samples.Accumulate(3, 1);   // Bucket 1-5.
+  samples.Accumulate(6, 1);   // Bucket 5-7.
+  samples.Accumulate(8, 1);   // Bucket 8-9. (7-8 skipped)
   samples.Accumulate(10, 1);  // Bucket 10-11. (9-10 skipped)
   samples.Accumulate(11, 1);  // Bucket 11-12.
 
   TestMetricsLogBase log;
   log.RecordHistogramDelta("Test", samples);
 
   const metrics::ChromeUserMetricsExtension* uma_proto = log.uma_proto();
   const metrics::HistogramEventProto& histogram_proto =
       uma_proto->histogram_event(uma_proto->histogram_event_size() - 1);
 
@@ skipping 20 matching lines @@
   // 10-11 becomes 10-/ (both optimizations apply, omit max is prioritized).
   EXPECT_TRUE(histogram_proto.bucket(3).has_min());
   EXPECT_FALSE(histogram_proto.bucket(3).has_max());
   EXPECT_EQ(10, histogram_proto.bucket(3).min());
 
   // 11-12 becomes /-12 (last record must keep max, min is same as max - 1).
   EXPECT_FALSE(histogram_proto.bucket(4).has_min());
   EXPECT_TRUE(histogram_proto.bucket(4).has_max());
   EXPECT_EQ(12, histogram_proto.bucket(4).max());
 }
+
+}  // namespace metrics