Remove SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS

content/shell/renderer/test_runner/web_test_proxy.cc

 // Copyright 2014 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/test_runner/web_test_proxy.h"
 
 #include <cctype>
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ skipping 559 matching lines @@
     : callback_(callback), wait_for_popup_(false) {
 }
 
 CaptureCallback::~CaptureCallback() {
 }
 
 void CaptureCallback::didCompositeAndReadback(const SkBitmap& bitmap) {
   TRACE_EVENT2("shell",
                "CaptureCallback::didCompositeAndReadback",
                "x",
-               bitmap.info().fWidth,
+               bitmap.info().width(),
                "y",
-               bitmap.info().fHeight);
+               bitmap.info().height());
   if (!wait_for_popup_) {
     callback_.Run(bitmap);
     delete this;
     return;
   }
   if (main_bitmap_.isNull()) {
     bitmap.deepCopyTo(&main_bitmap_);
     return;
   }
   SkCanvas canvas(main_bitmap_);
@@ skipping 797 matching lines @@
   // to cancel the input method's ongoing composition session.
   if (web_widget_)
     web_widget_->confirmComposition();
 }
 
 blink::WebString WebTestProxyBase::acceptLanguages() {
   return blink::WebString::fromUTF8(accept_languages_);
 }
 
 }  // namespace content