Separate RenderViewHost from RenderWidgetHost, part 2: public implementation.

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

 // 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/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include <Cocoa/Cocoa.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 200 matching lines @@
     // Owned by its |cocoa_view()|, i.e. |rwhv_cocoa_|.
     rwhv_mac_ = new RenderWidgetHostViewMac(rvh()->GetWidget(), false);
     rwhv_cocoa_.reset([rwhv_mac_->cocoa_view() retain]);
   }
   void TearDown() override {
     // Make sure the rwhv_mac_ is gone once the superclass's |TearDown()| runs.
     rwhv_cocoa_.reset();
     RecycleAndWait();
 
     // See comment in SetUp().
-    test_rvh()->SetView(static_cast<RenderWidgetHostViewBase*>(old_rwhv_));
+    test_rvh()->GetWidget()->SetView(
+        static_cast<RenderWidgetHostViewBase*>(old_rwhv_));
 
     ImageTransportFactory::Terminate();
     RenderViewHostImplTestHarness::TearDown();
   }
 
   void RecycleAndWait() {
     pool_.Recycle();
     base::MessageLoop::current()->RunUntilIdle();
     pool_.Recycle();
   }
 
   void DestroyHostViewRetainCocoaView() {
-    test_rvh()->SetView(nullptr);
+    test_rvh()->GetWidget()->SetView(nullptr);
     rwhv_mac_->Destroy();
   }
 
  private:
   // This class isn't derived from PlatformTest.
   base::mac::ScopedNSAutoreleasePool pool_;
 
   RenderWidgetHostView* old_rwhv_;
 
  protected:
@@ skipping 809 matching lines @@
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
   }
 
   // Clean up.
   host->Shutdown();
 }
 
 
 }  // namespace content