Build fix for #675

content/renderer/render_widget_unittest.cc

 // Copyright 2013 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/renderer/render_widget.h"
 
 #include <tuple>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 356 matching lines @@
   widget()->SendInputEvent(touch);
   histogram_tester().ExpectTotalCount("Event.Touch.TouchLatencyOutsideFling",
                                       2);
 }
 
 class PopupRenderWidget : public RenderWidget {
  public:
   explicit PopupRenderWidget(CompositorDependencies* compositor_deps)
       : RenderWidget(compositor_deps,
                      blink::WebPopupTypePage,
-                     ScreenInfo(),
+                     blink::WebScreenInfo(),
                      false,
                      false,
                      false) {
-    webwidget_internal_ = &mock_webwidget_;
+    webwidget_ = &mock_webwidget_;
     // A RenderWidget is not fully initialized until it has a routing ID.
     SetRoutingID(1);
     did_show_ = true;
   }
 
   IPC::TestSink* sink() { return &sink_; }
 
   MockWebWidget* mock_webwidget() { return &mock_webwidget_; }
 
   void SetScreenMetricsEmulationParameters(
       bool,
       const blink::WebDeviceEmulationParams&) override {}
 
  protected:
-  ~PopupRenderWidget() override { webwidget_internal_ = nullptr; }
+  ~PopupRenderWidget() override { webwidget_ = nullptr; }
 
   bool Send(IPC::Message* msg) override {
     sink_.OnMessageReceived(*msg);
     delete msg;
     return true;
   }
 
  private:
   IPC::TestSink sink_;
   MockWebWidget mock_webwidget_;
@@ skipping 81 matching lines @@
   blink::WebRect popup_emulated_rect(130, 170, 100, 400);
   widget()->setWindowRect(popup_emulated_rect);
 
   EXPECT_EQ(popup_emulated_rect.x, widget()->windowRect().x);
   EXPECT_EQ(popup_emulated_rect.y, widget()->windowRect().y);
   EXPECT_EQ(popup_emulated_rect.x, widget()->viewRect().x);
   EXPECT_EQ(popup_emulated_rect.y, widget()->viewRect().y);
 }
 
 }  // namespace content