Add ownership-transfer to histogram management calls.

base/metrics/histogram_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/metrics/histogram.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 171 matching lines @@
   EXPECT_NE(0U, allocator_->GetNextIterable(&iter, &type));  // CustomHistogram
   EXPECT_EQ(0U, allocator_->GetNextIterable(&iter, &type));
 
   // Create a second allocator and have it access the memory of the first.
   scoped_ptr<HistogramBase> recovered;
   PersistentMemoryAllocator recovery(
       allocator_memory_.get(), kAllocatorMemorySize, 0,
       0, std::string(), false);
   recovery.CreateIterator(&iter);
 
-  recovered.reset(GetNextPersistentHistogram(&recovery, &iter));
+  recovered = GetNextPersistentHistogram(&recovery, &iter);
   ASSERT_TRUE(recovered);
   recovered->CheckName("TestHistogram");
 
-  recovered.reset(GetNextPersistentHistogram(&recovery, &iter));
+  recovered = GetNextPersistentHistogram(&recovery, &iter);
   ASSERT_TRUE(recovered);
   recovered->CheckName("TestLinearHistogram");
 
-  recovered.reset(GetNextPersistentHistogram(&recovery, &iter));
+  recovered = GetNextPersistentHistogram(&recovery, &iter);
   ASSERT_TRUE(recovered);
   recovered->CheckName("TestBooleanHistogram");
 
-  recovered.reset(GetNextPersistentHistogram(&recovery, &iter));
+  recovered = GetNextPersistentHistogram(&recovery, &iter);
   ASSERT_TRUE(recovered);
   recovered->CheckName("TestCustomHistogram");
 
-  recovered.reset(GetNextPersistentHistogram(&recovery, &iter));
+  recovered = GetNextPersistentHistogram(&recovery, &iter);
   EXPECT_FALSE(recovered);
 
   // Use standard macros (but with fixed samples)
   LOCAL_HISTOGRAM_TIMES("Test2Histogram", TimeDelta::FromDays(1));
   LOCAL_HISTOGRAM_COUNTS("Test3Histogram", 30);
   LOCAL_HISTOGRAM_ENUMERATION("Test6Histogram", 129, 130);
 }
 
 // Check that the macro correctly matches histograms by name and records their
 // data together.
@@ skipping 578 matching lines @@
   // CustomHistogram needs at least 1 valid range.
   custom_ranges.clear();
   custom_ranges.push_back(0);
   EXPECT_DEATH(CustomHistogram::FactoryGet("BadRangesCustom3", custom_ranges,
                                            HistogramBase::kNoFlags),
                "");
 }
 #endif
 
 }  // namespace base