Refactor base/safe_numerics.h

chrome/browser/net/crl_set_fetcher.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 "chrome/browser/net/crl_set_fetcher.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
-#include "base/safe_numerics.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/cert/crl_set.h"
 #include "net/ssl/ssl_config_service.h"
 
@@ skipping 139 matching lines @@
   if (!net::CRLSet::GetIsDeltaUpdate(crl_set_bytes, &is_delta)) {
     LOG(WARNING) << "GetIsDeltaUpdate failed on CRL set from update CRX";
     return false;
   }
 
   if (!is_delta) {
     if (!net::CRLSet::Parse(crl_set_bytes, &crl_set_)) {
       LOG(WARNING) << "Failed to parse CRL set from update CRX";
       return false;
     }
-    int size = base::checked_numeric_cast<int>(crl_set_bytes.size());
+    int size = base::checked_cast<int>(crl_set_bytes.size());
     if (file_util::WriteFile(save_to, crl_set_bytes.data(), size) != size) {
       LOG(WARNING) << "Failed to save new CRL set to disk";
       // We don't return false here because we can still use this CRL set. When
       // we restart we might revert to an older version, then we'll
       // advertise the older version to Omaha and everything will still work.
     }
   } else {
     scoped_refptr<net::CRLSet> new_crl_set;
     if (!crl_set_->ApplyDelta(crl_set_bytes, &new_crl_set)) {
       LOG(WARNING) << "Failed to parse delta CRL set";
       return false;
     }
     VLOG(1) << "Applied CRL set delta #" << crl_set_->sequence()
             << "->#" << new_crl_set->sequence();
     const std::string new_crl_set_bytes = new_crl_set->Serialize();
-    int size = base::checked_numeric_cast<int>(new_crl_set_bytes.size());
+    int size = base::checked_cast<int>(new_crl_set_bytes.size());
     if (file_util::WriteFile(save_to, new_crl_set_bytes.data(), size) != size) {
       LOG(WARNING) << "Failed to save new CRL set to disk";
       // We don't return false here because we can still use this CRL set. When
       // we restart we might revert to an older version, then we'll
       // advertise the older version to Omaha and everything will still work.
     }
     crl_set_ = new_crl_set;
   }
 
   if (!BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &CRLSetFetcher::SetCRLSetIfNewer, this, crl_set_))) {
     NOTREACHED();
   }
 
   return true;
 }
 
 bool CRLSetFetcher::GetInstalledFile(
     const std::string& file, base::FilePath* installed_file) {
   return false;
 }
 
 CRLSetFetcher::~CRLSetFetcher() {}