Refactor base/safe_numerics.h

content/renderer/pepper/content_decryptor_delegate.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 "content/renderer/pepper/content_decryptor_delegate.h"
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
-#include "base/safe_numerics.h"
+#include "base/numerics/safe_conversions.h"
 #include "content/renderer/pepper/ppb_buffer_impl.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/channel_layout.h"
 #include "media/base/data_buffer.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
@@ skipping 970 matching lines @@
     memcpy(&timestamp, cur, sizeof(timestamp));
     cur += sizeof(timestamp);
     bytes_left -= sizeof(timestamp);
 
     memcpy(&frame_size, cur, sizeof(frame_size));
     cur += sizeof(frame_size);
     bytes_left -= sizeof(frame_size);
 
     // We should *not* have empty frames in the list.
     if (frame_size <= 0 ||
-        bytes_left < base::checked_numeric_cast<size_t>(frame_size)) {
+        bytes_left < base::checked_cast<size_t>(frame_size)) {
       return false;
     }
 
     // Setup channel pointers.  AudioBuffer::CopyFrom() will only use the first
     // one in the case of interleaved data.
     const int size_per_channel = frame_size / audio_channel_count_;
     for (int i = 0; i < audio_channel_count_; ++i)
       channel_ptrs[i] = cur + i * size_per_channel;
 
     const int frame_count = frame_size / audio_bytes_per_frame;
@@ skipping 34 matching lines @@
     const media::Decryptor::AudioBuffers empty_frames;
     audio_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError,
                                           empty_frames);
   }
 
   if (!video_decode_cb_.is_null())
     video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
 }
 
 }  // namespace content