Refactor base/safe_numerics.h

base/metrics/histogram_delta_serialization.cc

 // Copyright 2013 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_delta_serialization.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_snapshot_manager.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/pickle.h"
-#include "base/safe_numerics.h"
 #include "base/values.h"
 
 namespace base {
 
 namespace {
 
 // Create or find existing histogram and add the samples from pickle.
 // Silently returns when seeing any data problem in the pickle.
 void DeserializeHistogramAndAddSamples(PickleIterator* iter) {
   HistogramBase* histogram = DeserializeHistogramInfo(iter);
@@ skipping 46 matching lines @@
   histogram_snapshot_manager_.PrepareDeltas(
       Histogram::kIPCSerializationSourceFlag, false);
   serialized_deltas_ = NULL;
 }
 
 // static
 void HistogramDeltaSerialization::DeserializeAndAddSamples(
     const std::vector<std::string>& serialized_deltas) {
   for (std::vector<std::string>::const_iterator it = serialized_deltas.begin();
        it != serialized_deltas.end(); ++it) {
-    Pickle pickle(it->data(), checked_numeric_cast<int>(it->size()));
+    Pickle pickle(it->data(), checked_cast<int>(it->size()));
     PickleIterator iter(pickle);
     DeserializeHistogramAndAddSamples(&iter);
   }
 }
 
 void HistogramDeltaSerialization::RecordDelta(
     const HistogramBase& histogram,
     const HistogramSamples& snapshot) {
   DCHECK_NE(0, snapshot.TotalCount());
 
@@ skipping 13 matching lines @@
     HistogramBase::Inconsistency problem) {
   inconsistencies_unique_histogram_->Add(problem);
 }
 
 void HistogramDeltaSerialization::InconsistencyDetectedInLoggedCount(
     int amount) {
   inconsistent_snapshot_histogram_->Add(std::abs(amount));
 }
 
 }  // namespace base