Remove std::string histogram name from HistogramBase object.

base/metrics/histogram_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 <vector>
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 44 matching lines @@
   PickleIterator iter(pickle);
   HistogramBase* deserialized = DeserializeHistogramInfo(&iter);
   EXPECT_EQ(histogram, deserialized);
 
   ResetStatisticsRecorder();
 
   PickleIterator iter2(pickle);
   deserialized = DeserializeHistogramInfo(&iter2);
   EXPECT_TRUE(deserialized);
   EXPECT_NE(histogram, deserialized);
-  EXPECT_EQ("TestHistogram", deserialized->histogram_name());
+  EXPECT_EQ("TestHistogram", StringPiece(deserialized->histogram_name()));
   EXPECT_TRUE(deserialized->HasConstructionArguments(1, 1000, 10));
 
   // kIPCSerializationSourceFlag will be cleared.
   EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, deserialized->flags());
 }
 
 TEST_F(HistogramBaseTest, DeserializeLinearHistogram) {
   HistogramBase* histogram = LinearHistogram::FactoryGet(
       "TestHistogram", 1, 1000, 10,
       HistogramBase::kIPCSerializationSourceFlag);
 
   Pickle pickle;
   ASSERT_TRUE(histogram->SerializeInfo(&pickle));
 
   PickleIterator iter(pickle);
   HistogramBase* deserialized = DeserializeHistogramInfo(&iter);
   EXPECT_EQ(histogram, deserialized);
 
   ResetStatisticsRecorder();
 
   PickleIterator iter2(pickle);
   deserialized = DeserializeHistogramInfo(&iter2);
   EXPECT_TRUE(deserialized);
   EXPECT_NE(histogram, deserialized);
-  EXPECT_EQ("TestHistogram", deserialized->histogram_name());
+  EXPECT_EQ("TestHistogram", StringPiece(deserialized->histogram_name()));
   EXPECT_TRUE(deserialized->HasConstructionArguments(1, 1000, 10));
   EXPECT_EQ(0, deserialized->flags());
 }
 
 TEST_F(HistogramBaseTest, DeserializeBooleanHistogram) {
   HistogramBase* histogram = BooleanHistogram::FactoryGet(
       "TestHistogram", HistogramBase::kIPCSerializationSourceFlag);
 
   Pickle pickle;
   ASSERT_TRUE(histogram->SerializeInfo(&pickle));
 
   PickleIterator iter(pickle);
   HistogramBase* deserialized = DeserializeHistogramInfo(&iter);
   EXPECT_EQ(histogram, deserialized);
 
   ResetStatisticsRecorder();
 
   PickleIterator iter2(pickle);
   deserialized = DeserializeHistogramInfo(&iter2);
   EXPECT_TRUE(deserialized);
   EXPECT_NE(histogram, deserialized);
-  EXPECT_EQ("TestHistogram", deserialized->histogram_name());
+  EXPECT_EQ("TestHistogram", StringPiece(deserialized->histogram_name()));
   EXPECT_TRUE(deserialized->HasConstructionArguments(1, 2, 3));
   EXPECT_EQ(0, deserialized->flags());
 }
 
 TEST_F(HistogramBaseTest, DeserializeCustomHistogram) {
   std::vector<HistogramBase::Sample> ranges;
   ranges.push_back(13);
   ranges.push_back(5);
   ranges.push_back(9);
 
   HistogramBase* histogram = CustomHistogram::FactoryGet(
       "TestHistogram", ranges, HistogramBase::kIPCSerializationSourceFlag);
 
   Pickle pickle;
   ASSERT_TRUE(histogram->SerializeInfo(&pickle));
 
   PickleIterator iter(pickle);
   HistogramBase* deserialized = DeserializeHistogramInfo(&iter);
   EXPECT_EQ(histogram, deserialized);
 
   ResetStatisticsRecorder();
 
   PickleIterator iter2(pickle);
   deserialized = DeserializeHistogramInfo(&iter2);
   EXPECT_TRUE(deserialized);
   EXPECT_NE(histogram, deserialized);
-  EXPECT_EQ("TestHistogram", deserialized->histogram_name());
+  EXPECT_EQ("TestHistogram", StringPiece(deserialized->histogram_name()));
   EXPECT_TRUE(deserialized->HasConstructionArguments(5, 13, 4));
   EXPECT_EQ(0, deserialized->flags());
 }
 
 TEST_F(HistogramBaseTest, DeserializeSparseHistogram) {
   HistogramBase* histogram = SparseHistogram::FactoryGet(
       "TestHistogram", HistogramBase::kIPCSerializationSourceFlag);
 
   Pickle pickle;
   ASSERT_TRUE(histogram->SerializeInfo(&pickle));
 
   PickleIterator iter(pickle);
   HistogramBase* deserialized = DeserializeHistogramInfo(&iter);
   EXPECT_EQ(histogram, deserialized);
 
   ResetStatisticsRecorder();
 
   PickleIterator iter2(pickle);
   deserialized = DeserializeHistogramInfo(&iter2);
   EXPECT_TRUE(deserialized);
   EXPECT_NE(histogram, deserialized);
-  EXPECT_EQ("TestHistogram", deserialized->histogram_name());
+  EXPECT_EQ("TestHistogram", StringPiece(deserialized->histogram_name()));
   EXPECT_EQ(0, deserialized->flags());
 }
 
 TEST_F(HistogramBaseTest, CreationReportHistogram) {
   // Enabled creation report. Itself is not included in the report.
   HistogramBase* report = GetCreationReportHistogram("CreationReportTest");
   ASSERT_TRUE(report);
 
   std::vector<HistogramBase::Sample> ranges;
   ranges.push_back(1);
@@ skipping 41 matching lines @@
   BooleanHistogram::FactoryGet("CRH-Boolean", 0);
   CustomHistogram::FactoryGet("CRH-Custom", ranges, 0);
   SparseHistogram::FactoryGet("CRH-Sparse", 0);
   samples = report->SnapshotSamples();
   EXPECT_EQ(1, samples->GetCount(HISTOGRAM_REPORT_CREATED));
   EXPECT_EQ(9, samples->GetCount(HISTOGRAM_REPORT_HISTOGRAM_CREATED));
   EXPECT_EQ(5, samples->GetCount(HISTOGRAM_REPORT_HISTOGRAM_LOOKUP));
 }
 
 }  // namespace base