Refactor base/safe_numerics.h

tools/imagediff/image_diff.cc

 // Copyright (c) 2011 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.
 
 // This file input format is based loosely on
 // Tools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
 // what the run-webkit-tests script expects.
 
 #include <algorithm>
 #include <iostream>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/process/memory.h"
-#include "base/safe_numerics.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "tools/imagediff/image_diff_png.h"
 
 #if defined(OS_WIN)
 #include "windows.h"
 #endif
 
 // Causes the app to remain open, waiting for pairs of filenames on stdin.
 // The caller is then responsible for terminating this app.
@@ skipping 344 matching lines @@
   bool same = CreateImageDiff(baseline_image, actual_image, &diff_image);
   if (same)
     return kStatusSame;
 
   std::vector<unsigned char> png_encoding;
   image_diff_png::EncodeRGBAPNG(
       diff_image.data(), diff_image.w(), diff_image.h(),
       diff_image.w() * 4, &png_encoding);
   if (file_util::WriteFile(out_file,
           reinterpret_cast<char*>(&png_encoding.front()),
-          base::checked_numeric_cast<int>(png_encoding.size())) < 0)
+          base::checked_cast<int>(png_encoding.size())) < 0)
     return kStatusError;
 
   return kStatusDifferent;
 }
 
 // It isn't strictly correct to only support ASCII paths, but this
 // program reads paths on stdin and the program that spawns it outputs
 // paths as non-wide strings anyway.
 base::FilePath FilePathFromASCII(const std::string& str) {
 #if defined(OS_WIN)
@@ skipping 40 matching lines @@
                         base::FilePath(args[2]));
     }
   } else if (args.size() == 2) {
     return CompareImages(
         base::FilePath(args[0]), base::FilePath(args[1]), histograms);
   }
 
   PrintHelp();
   return kStatusError;
 }