Remove SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS

content/shell/renderer/layout_test/blink_test_runner.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/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 739 matching lines @@
       // incremental painting in slimming paint mode.
       proxy()->LayoutAndPaintAsyncThen(base::Bind(
           &BlinkTestRunner::CaptureDumpComplete, base::Unretained(this)));
       return;
   }
 
   CaptureDumpComplete();
 }
 
 void BlinkTestRunner::CaptureDumpPixels(const SkBitmap& snapshot) {
-  DCHECK_NE(0, snapshot.info().fWidth);
-  DCHECK_NE(0, snapshot.info().fHeight);
+  DCHECK_NE(0, snapshot.info().width());
+  DCHECK_NE(0, snapshot.info().height());
 
   SkAutoLockPixels snapshot_lock(snapshot);
   // The snapshot arrives from the GPU process via shared memory. Because MSan
   // can't track initializedness across processes, we must assure it that the
   // pixels are in fact initialized.
   MSAN_UNPOISON(snapshot.getPixels(), snapshot.getSize());
   base::MD5Digest digest;
   base::MD5Sum(snapshot.getPixels(), snapshot.getSize(), &digest);
   std::string actual_pixel_hash = base::MD5DigestToBase16(digest);
 
@@ skipping 68 matching lines @@
 
   leak_detector_->TryLeakDetection(main_frame);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content