| Index: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| similarity index 77%
|
| copy from content/browser/renderer_host/render_widget_host_view_guest_unittest.cc
|
| copy to content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| index b99743aa5ffbab1c10d43c5b5256a4c091fbc5bc..9649042e69364ca5b0bd012716216431a6eb9162 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_guest_unittest.cc
|
| +++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // 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 "content/browser/frame_host/render_widget_host_view_child_frame.h"
|
|
|
| #include "base/basictypes.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -23,9 +23,9 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
|
| virtual ~MockRenderWidgetHostDelegate() {}
|
| };
|
|
|
| -class RenderWidgetHostViewGuestTest : public testing::Test {
|
| +class RenderWidgetHostViewChildFrameTest : public testing::Test {
|
| public:
|
| - RenderWidgetHostViewGuestTest() {}
|
| + RenderWidgetHostViewChildFrameTest() {}
|
|
|
| virtual void SetUp() {
|
| browser_context_.reset(new TestBrowserContext);
|
| @@ -33,8 +33,7 @@ class RenderWidgetHostViewGuestTest : public testing::Test {
|
| new MockRenderProcessHost(browser_context_.get());
|
| widget_host_ = new RenderWidgetHostImpl(
|
| &delegate_, process_host, MSG_ROUTING_NONE, false);
|
| - view_ = new RenderWidgetHostViewGuest(
|
| - widget_host_, NULL, new TestRenderWidgetHostView(widget_host_));
|
| + view_ = new RenderWidgetHostViewChildFrame(widget_host_);
|
| }
|
|
|
| virtual void TearDown() {
|
| @@ -56,15 +55,15 @@ class RenderWidgetHostViewGuestTest : public testing::Test {
|
| // Tests should set these to NULL if they've already triggered their
|
| // destruction.
|
| RenderWidgetHostImpl* widget_host_;
|
| - RenderWidgetHostViewGuest* view_;
|
| + RenderWidgetHostViewChildFrame* view_;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuestTest);
|
| + DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest);
|
| };
|
|
|
| } // namespace
|
|
|
| -TEST_F(RenderWidgetHostViewGuestTest, VisibilityTest) {
|
| +TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) {
|
| view_->Show();
|
| ASSERT_TRUE(view_->IsShowing());
|
|
|
| @@ -78,4 +77,11 @@ TEST_F(RenderWidgetHostViewGuestTest, VisibilityTest) {
|
| ASSERT_FALSE(view_->IsShowing());
|
| }
|
|
|
| +TEST_F(RenderWidgetHostViewChildFrameTest, SetSizeTest) {
|
| + gfx::Size size(100, 100);
|
| +
|
| + view_->SetSize(size);
|
| + ASSERT_TRUE(view_->GetViewBounds().size() == size);
|
| +}
|
| +
|
| } // namespace content
|
|
|