Refactor base/safe_numerics.h

ui/snapshot/snapshot_aura.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 "ui/snapshot/snapshot.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
-#include "base/safe_numerics.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/task_runner_util.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
@@ skipping 57 matching lines @@
     gfx::Size target_size_pre_rotation,
     gfx::Display::Rotation rotation) {
   SkBitmap bitmap =
       ScaleAndRotateBitmap(input_bitmap, target_size_pre_rotation, rotation);
   scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes);
   unsigned char* pixels =
       reinterpret_cast<unsigned char*>(bitmap.pixelRef()->pixels());
   if (!gfx::PNGCodec::Encode(pixels,
                              gfx::PNGCodec::FORMAT_BGRA,
                              gfx::Size(bitmap.width(), bitmap.height()),
-                             base::checked_numeric_cast<int>(bitmap.rowBytes()),
+                             base::checked_cast<int>(bitmap.rowBytes()),
                              true,
                              std::vector<gfx::PNGCodec::Comment>(),
                              &png_data->data())) {
     return scoped_refptr<base::RefCountedBytes>();
   }
   return png_data;
 }
 
 void ScaleAndRotateCopyOutputResult(
     const GrabWindowSnapshotAsyncCallback& callback,
@@ skipping 88 matching lines @@
 
   gfx::Display display =
       gfx::Screen::GetScreenFor(window)->GetDisplayNearestWindow(window);
   RotateBitmap(&bitmap, display.rotation());
 
   unsigned char* pixels = reinterpret_cast<unsigned char*>(
       bitmap.pixelRef()->pixels());
   return gfx::PNGCodec::Encode(
       pixels, gfx::PNGCodec::FORMAT_BGRA,
       gfx::Size(bitmap.width(), bitmap.height()),
-      base::checked_numeric_cast<int>(bitmap.rowBytes()),
+      base::checked_cast<int>(bitmap.rowBytes()),
       true, std::vector<gfx::PNGCodec::Comment>(),
       png_representation);
 }
 
 void MakeAsyncCopyRequest(
     gfx::NativeWindow window,
     const gfx::Rect& source_rect,
     const cc::CopyOutputRequest::CopyOutputRequestCallback& callback) {
   scoped_ptr<cc::CopyOutputRequest> request =
       cc::CopyOutputRequest::CreateBitmapRequest(callback);
@@ skipping 47 matching lines @@
   MakeAsyncCopyRequest(window,
                        source_rect,
                        base::Bind(&ScaleRotateAndEncodeCopyOutputResult,
                                   callback,
                                   target_size,
                                   rotation,
                                   background_task_runner));
 }
 
 }  // namespace ui