HistogramTester::GetHistogramSamplesSinceCreation never returns null

sql/connection_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 "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 1176 matching lines @@
 
   EXPECT_TRUE(db().Execute("SELECT milliadjust(10)"));
 
   scoped_ptr<base::HistogramSamples> samples(
       tester.GetHistogramSamplesSinceCreation(kQueryTime));
   ASSERT_TRUE(samples);
   // 10 for the adjust, 1 for the measurement.
   EXPECT_EQ(11, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kUpdateTime);
-  EXPECT_TRUE(!samples || samples->sum() == 0);
+  EXPECT_EQ(0, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kCommitTime);
-  EXPECT_TRUE(!samples || samples->sum() == 0);
+  EXPECT_EQ(0, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kAutoCommitTime);
-  EXPECT_TRUE(!samples || samples->sum() == 0);
+  EXPECT_EQ(0, samples->sum());
 }
 
 // Autocommit update allocates time to QueryTime, UpdateTime, and
 // AutoCommitTime.
 TEST_F(SQLConnectionTest, TimeUpdateAutocommit) {
   // Re-open with histogram tag.  Use an in-memory database to minimize variance
   // due to filesystem.
   db().Close();
   db().set_histogram_tag("Test");
   ASSERT_TRUE(db().OpenInMemory());
@@ skipping 16 matching lines @@
   ASSERT_TRUE(samples);
   // 10 for the adjust, 1 for the measurement.
   EXPECT_EQ(11, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kUpdateTime);
   ASSERT_TRUE(samples);
   // 10 for the adjust, 1 for the measurement.
   EXPECT_EQ(11, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kCommitTime);
-  EXPECT_TRUE(!samples || samples->sum() == 0);
+  EXPECT_EQ(0, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kAutoCommitTime);
   ASSERT_TRUE(samples);
   // 10 for the adjust, 1 for the measurement.
   EXPECT_EQ(11, samples->sum());
 }
 
 // Update with explicit transaction allocates time to QueryTime, UpdateTime, and
 // CommitTime.
 TEST_F(SQLConnectionTest, TimeUpdateTransaction) {
@@ skipping 38 matching lines @@
   // 10 for insert adjust, 10 for update adjust, 100 for commit adjust, 1 for
   // measuring each of INSERT, UPDATE, and COMMIT.
   EXPECT_EQ(123, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kCommitTime);
   ASSERT_TRUE(samples);
   // 100 for commit adjust, 1 for measuring COMMIT.
   EXPECT_EQ(101, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kAutoCommitTime);
-  EXPECT_TRUE(!samples || samples->sum() == 0);
+  EXPECT_EQ(0, samples->sum());
 }
 
 }  // namespace