Backfill some UI tests.

content/test/test_render_view_host.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/test/test_render_view_host.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/web_preferences.h"
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_web_contents.h"
 #include "media/base/video_frame.h"
 #include "ui/aura/env.h"
 #include "ui/compositor/compositor.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace content {
 
 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
                         int nav_entry_id,
                         bool did_create_new_entry,
                         const GURL& url,
                         ui::PageTransition transition) {
   params->nav_entry_id = nav_entry_id;
@@ skipping 10 matching lines @@
   params->was_within_same_document = false;
   params->method = "GET";
   params->page_state = PageState::CreateFromURL(url);
 }
 
 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
     : rwh_(RenderWidgetHostImpl::From(rwh)),
       is_showing_(false),
       is_occluded_(false),
       did_swap_compositor_frame_(false),
-      background_color_(SK_ColorWHITE) {
+      background_color_(SK_ColorWHITE),
+      window_(new aura::Window(this)) {

[sky, 2017/05/10 15:49:50]

Call window_->set_owned_by_parent(false). That way if test code ends up
parenting the window the window won't be unexpectedly deleted.

Could you also use TestWindowDelegate (ui/aura/test/test_window_delegate.h) as
the delegate? That way less code to update as WindowDelegate changes, and you
don't really TestRenderWidgetHostview to be the delegate. Using
TestWindowDelegate should also mean you can put the window_ in a unique_ptr (use
TestWindowDelegate::CreateSelfDestroyingDelegate() so that TestWindowDelegate
deletes itself when the window is deleted).

[Bret, 2017/05/10 21:18:39]

All done.

 #if defined(OS_ANDROID)
   frame_sink_id_ = AllocateFrameSinkId();
   GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
 #else
   // Not all tests initialize or need an image transport factory.
   if (ImageTransportFactory::GetInstance()) {
     frame_sink_id_ = AllocateFrameSinkId();
     GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   }
 #endif
 
   rwh_->SetView(this);
+  window_->Init(ui::LayerType::LAYER_NOT_DRAWN);
 }
 
 TestRenderWidgetHostView::~TestRenderWidgetHostView() {
   cc::SurfaceManager* manager = GetSurfaceManager();
   if (manager) {
     manager->InvalidateFrameSinkId(frame_sink_id_);
   }
+  delete window_;
 }
 
 RenderWidgetHost* TestRenderWidgetHostView::GetRenderWidgetHost() const {
   return rwh_;
 }
 
 gfx::Vector2dF TestRenderWidgetHostView::GetLastScrollOffset() const {
   return gfx::Vector2dF();
 }
 
 gfx::NativeView TestRenderWidgetHostView::GetNativeView() const {
-  return nullptr;
+  return window_;
 }
 
 gfx::NativeViewAccessible TestRenderWidgetHostView::GetNativeViewAccessible() {
   return nullptr;
 }
 
 ui::TextInputClient* TestRenderWidgetHostView::GetTextInputClient() {
   return &text_input_client_;
 }
 
@@ skipping 91 matching lines @@
   return false;
 }
 
 void TestRenderWidgetHostView::UnlockMouse() {
 }
 
 cc::FrameSinkId TestRenderWidgetHostView::GetFrameSinkId() {
   return frame_sink_id_;
 }
 
+gfx::Size TestRenderWidgetHostView::GetMinimumSize() const {
+  return gfx::Size();
+}
+
+gfx::Size TestRenderWidgetHostView::GetMaximumSize() const {
+  return gfx::Size();
+}
+
+gfx::NativeCursor TestRenderWidgetHostView::GetCursor(const gfx::Point& point) {
+  return ui::CursorType::kNone;
+}
+
+int TestRenderWidgetHostView::GetNonClientComponent(
+    const gfx::Point& point) const {
+  return 0;
+}
+
+bool TestRenderWidgetHostView::ShouldDescendIntoChildForEventHandling(
+    aura::Window* child,
+    const gfx::Point& location) {
+  return false;
+}
+
+bool TestRenderWidgetHostView::CanFocus() {
+  return false;
+}
+
+bool TestRenderWidgetHostView::HasHitTestMask() const {
+  return false;
+}
+
+void TestRenderWidgetHostView::GetHitTestMask(gfx::Path* mask) const {}
+
 TestRenderViewHost::TestRenderViewHost(
     SiteInstance* instance,
     std::unique_ptr<RenderWidgetHostImpl> widget,
     RenderViewHostDelegate* delegate,
     int32_t main_frame_routing_id,
     bool swapped_out)
     : RenderViewHostImpl(instance,
                          std::move(widget),
                          delegate,
                          main_frame_routing_id,
@@ skipping 103 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content