Refactor base/safe_numerics.h

chrome/browser/media_galleries/win/mtp_device_operations_util.cc

 // Copyright (c) 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 "chrome/browser/media_galleries/win/mtp_device_operations_util.h"
 
 #include <portabledevice.h>
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/safe_numerics.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_propvariant.h"
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace media_transfer_protocol {
@@ skipping 352 matching lines @@
                             optimal_transfer_size, &bytes_read);
   // IStream::Read() returns S_FALSE when the actual number of bytes read from
   // the stream object is less than the number of bytes requested (aka
   // |optimal_transfer_size|). This indicates the end of the stream has been
   // reached.
   if (FAILED(hr))
     return 0U;
   DCHECK_GT(bytes_read, 0U);
   CHECK_LE(bytes_read, buffer.length());
   int data_len =
-      base::checked_numeric_cast<int>(
+      base::checked_cast<int>(
           std::min(bytes_read,
-                   base::checked_numeric_cast<DWORD>(buffer.length())));
+                   base::checked_cast<DWORD>(buffer.length())));
   if (file_util::AppendToFile(local_path, buffer.c_str(), data_len) != data_len)
     return 0U;
   return data_len;
 }
 
 base::string16 GetObjectIdFromName(IPortableDevice* device,
                                    const base::string16& parent_id,
                                    const base::string16& object_name) {
   MTPDeviceObjectEntries object_entries;
   if (!GetMTPDeviceObjectEntries(device, parent_id, object_name,
                                  &object_entries) ||
       object_entries.empty())
     return base::string16();
   // TODO(thestig): This DCHECK can fail. Multiple MTP objects can have
   // the same name. Handle the situation gracefully. Refer to crbug.com/169930
   // for more details.
   DCHECK_EQ(1U, object_entries.size());
   return object_entries[0].object_id;
 }
 
 }  // namespace media_transfer_protocol