Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(455)

Unified Diff: base/metrics/histogram_base_unittest.cc

Issue 2973863002: Remove std::string histogram name from HistogramBase object.
Patch Set: rebased Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/metrics/histogram_base.cc ('k') | base/metrics/histogram_snapshot_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/metrics/histogram_base_unittest.cc
diff --git a/base/metrics/histogram_base_unittest.cc b/base/metrics/histogram_base_unittest.cc
index 1eb8fd46084ba2c82d396db9f810042b90376f5d..bb46bc49292c1d51cfebac8b9db40ff55a18c427 100644
--- a/base/metrics/histogram_base_unittest.cc
+++ b/base/metrics/histogram_base_unittest.cc
@@ -62,7 +62,7 @@ TEST_F(HistogramBaseTest, DeserializeHistogram) {
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.
@@ -87,7 +87,7 @@ TEST_F(HistogramBaseTest, DeserializeLinearHistogram) {
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());
}
@@ -109,7 +109,7 @@ TEST_F(HistogramBaseTest, DeserializeBooleanHistogram) {
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());
}
@@ -136,7 +136,7 @@ TEST_F(HistogramBaseTest, DeserializeCustomHistogram) {
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());
}
@@ -158,7 +158,7 @@ TEST_F(HistogramBaseTest, DeserializeSparseHistogram) {
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());
}
« no previous file with comments | « base/metrics/histogram_base.cc ('k') | base/metrics/histogram_snapshot_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698