2 files changed, 7 insertions, 5 deletions
diff --git a/chromium/tools/imagediff/image_diff.cc b/chromium/tools/imagediff/image_diff.cc
index 06802ea6372..d5c727373be 100644
--- a/chromium/tools/imagediff/image_diff.cc
+++ b/chromium/tools/imagediff/image_diff.cc
@@ -18,10 +18,10 @@
 #include <unordered_map>
 #include <vector>
 
+#include "base/check.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/process/memory.h"
 #include "base/strings/string_util.h"
diff --git a/chromium/tools/imagediff/image_diff_png.cc b/chromium/tools/imagediff/image_diff_png.cc
index 7524026c192..806923906f1 100644
--- a/chromium/tools/imagediff/image_diff_png.cc
+++ b/chromium/tools/imagediff/image_diff_png.cc
@@ -7,7 +7,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "base/logging.h"
+#include <ostream>
+
+#include "base/check.h"
+#include "base/notreached.h"
 #include "build/build_config.h"
 #include "third_party/libpng/png.h"
 #include "third_party/zlib/zlib.h"
@@ -87,11 +90,10 @@ class PngDecoderState {
         output_channels(0),
         is_opaque(true),
         output(o),
-        row_converter(NULL),
+        row_converter(nullptr),
         width(0),
         height(0),
-        done(false) {
-  }
+        done(false) {}
 
   ColorFormat output_format;
   int output_channels;