Reorganize histograms for persistence.

components/metrics/metrics_log_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/metrics_log.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 174 matching lines @@
   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);
+  base::SampleVector samples(1, &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(10, 1);  // Bucket 10-11. (9-10 skipped)
   samples.Accumulate(11, 1);  // Bucket 11-12.
 
   TestMetricsServiceClient client;
   TestingPrefServiceSimple prefs;
   TestMetricsLog log(
       kClientId, kSessionId, MetricsLog::ONGOING_LOG, &client, &prefs_);
@@ skipping 209 matching lines @@
   TestMetricsServiceClient client;
   client.set_product(kTestProduct);
   TestMetricsLog log(
       kClientId, kSessionId, MetricsLog::ONGOING_LOG, &client, &prefs_);
   // Check that the product is set to |kTestProduct|.
   EXPECT_TRUE(log.uma_proto().has_product());
   EXPECT_EQ(kTestProduct, log.uma_proto().product());
 }
 
 }  // namespace metrics