Re-fix http://crbug.com/87176, and add a test.

content/browser/renderer_host/render_widget_host_view_guest_unittest.cc

 // Copyright (c) 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/browser/renderer_host/render_widget_host_view_guest.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 15 matching lines @@
 class RenderWidgetHostViewGuestTest : public testing::Test {
  public:
   RenderWidgetHostViewGuestTest() {}
 
   virtual void SetUp() {
     browser_context_.reset(new TestBrowserContext);
     MockRenderProcessHost* process_host =
         new MockRenderProcessHost(browser_context_.get());
     widget_host_ = new RenderWidgetHostImpl(
         &delegate_, process_host, MSG_ROUTING_NONE);
-    test_platform_view_.reset(new TestRenderWidgetHostView(widget_host_));
-    view_ = static_cast<RenderWidgetHostViewGuest*>(
-        new RenderWidgetHostViewGuest(
-            widget_host_, NULL, test_platform_view_.get()));
+    view_ = new RenderWidgetHostViewGuest(
+        widget_host_, NULL, new TestRenderWidgetHostView(widget_host_));
   }
 
   virtual void TearDown() {
     if (view_)
       view_->Destroy();
     delete widget_host_;
 
     browser_context_.reset();
 
     message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
     message_loop_.RunUntilIdle();
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
   scoped_ptr<BrowserContext> browser_context_;
   MockRenderWidgetHostDelegate delegate_;
 
   // Tests should set these to NULL if they've already triggered their
   // destruction.
   RenderWidgetHostImpl* widget_host_;
   RenderWidgetHostViewGuest* view_;
 
-  scoped_ptr<TestRenderWidgetHostView> test_platform_view_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuestTest);
 };
 
 }  // namespace
 
 TEST_F(RenderWidgetHostViewGuestTest, VisibilityTest) {
   view_->Show();
   ASSERT_TRUE(view_->IsShowing());
 
   view_->Hide();
   ASSERT_FALSE(view_->IsShowing());
 
   view_->WasShown();
   ASSERT_TRUE(view_->IsShowing());
 
   view_->WasHidden();
   ASSERT_FALSE(view_->IsShowing());
 }
 
 }  // namespace content