Apply View::set_preferred_size in some more places.

chrome/browser/ui/views/frame/browser_view_layout_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 "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "base/macros.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
 #include "chrome/browser/ui/views/frame/contents_layout_manager.h"
@@ skipping 52 matching lines @@
   bool tab_strip_visible_;
   bool toolbar_visible_;
   bool bookmark_bar_visible_;
   bool download_shelf_needs_layout_;
 
   DISALLOW_COPY_AND_ASSIGN(MockBrowserViewLayoutDelegate);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// A simple view that prefers an initial size.
-class MockView : public views::View {
- public:
-  explicit MockView(gfx::Size initial_size)
-      : size_(initial_size) {
-    SetBoundsRect(gfx::Rect(gfx::Point(), size_));
-  }
-  ~MockView() override {}
-
-  // views::View overrides:
-  gfx::Size GetPreferredSize() const override { return size_; }
-
- private:
-  gfx::Size size_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockView);
-};
+views::View* CreateFixedSizeView(const gfx::Size& size) {
+  auto* view = new views::View;
+  view->set_preferred_size(size);
+  view->SizeToPreferredSize();
+  return view;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class MockImmersiveModeController : public ImmersiveModeController {
  public:
   MockImmersiveModeController() : ImmersiveModeController(Type::STUB) {}
   ~MockImmersiveModeController() override {}
 
   // ImmersiveModeController overrides:
   void Init(BrowserView* browser_view) override {}
@@ skipping 27 matching lines @@
         tab_strip_(nullptr),
         toolbar_(nullptr),
         infobar_container_(nullptr),
         contents_container_(nullptr),
         contents_web_view_(nullptr),
         devtools_web_view_(nullptr) {}
   ~BrowserViewLayoutTest() override {}
 
   BrowserViewLayout* layout() { return layout_.get(); }
   MockBrowserViewLayoutDelegate* delegate() { return delegate_; }
-  MockView* root_view() { return root_view_.get(); }
-  MockView* top_container() { return top_container_; }
+  views::View* root_view() { return root_view_.get(); }
+  views::View* top_container() { return top_container_; }
   TabStrip* tab_strip() { return tab_strip_; }
-  MockView* toolbar() { return toolbar_; }
+  views::View* toolbar() { return toolbar_; }
   InfoBarContainerView* infobar_container() { return infobar_container_; }
-  MockView* contents_container() { return contents_container_; }
+  views::View* contents_container() { return contents_container_; }
 
   // BrowserWithTestWindowTest overrides:
   void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
 
-    root_view_.reset(new MockView(gfx::Size(800, 600)));
+    root_view_.reset(CreateFixedSizeView(gfx::Size(800, 600)));
 
     immersive_mode_controller_.reset(new MockImmersiveModeController);
 
-    top_container_ = new MockView(gfx::Size(800, 60));
+    top_container_ = CreateFixedSizeView(gfx::Size(800, 60));
     tab_strip_ = new TabStrip(nullptr);
     top_container_->AddChildView(tab_strip_);
-    toolbar_ = new MockView(gfx::Size(800, 30));
+    toolbar_ = CreateFixedSizeView(gfx::Size(800, 30));
     top_container_->AddChildView(toolbar_);
     root_view_->AddChildView(top_container_);
 
     infobar_container_ = new InfoBarContainerView(nullptr);
     root_view_->AddChildView(infobar_container_);
 
-    contents_web_view_ = new MockView(gfx::Size(800, 600));
-    devtools_web_view_ = new MockView(gfx::Size(800, 600));
+    contents_web_view_ = CreateFixedSizeView(gfx::Size(800, 600));
+    devtools_web_view_ = CreateFixedSizeView(gfx::Size(800, 600));
     devtools_web_view_->SetVisible(false);
 
-    contents_container_ = new MockView(gfx::Size(800, 600));
+    contents_container_ = CreateFixedSizeView(gfx::Size(800, 600));
     contents_container_->AddChildView(devtools_web_view_);
     contents_container_->AddChildView(contents_web_view_);
     ContentsLayoutManager* contents_layout_manager =
         new ContentsLayoutManager(devtools_web_view_, contents_web_view_);
     contents_container_->SetLayoutManager(contents_layout_manager);
 
     root_view_->AddChildView(contents_container_);
 
     // TODO(jamescook): Attach |layout_| to |root_view_|?
     layout_.reset(new BrowserViewLayout);
     delegate_ = new MockBrowserViewLayoutDelegate(contents_web_view_);
     layout_->Init(delegate_,
                   browser(),
                   nullptr,  // BrowserView.
                   top_container_,
                   tab_strip_,
                   toolbar_,
                   infobar_container_,
                   contents_container_,
                   contents_layout_manager,
                   immersive_mode_controller_.get());
   }
 
  private:
   std::unique_ptr<BrowserViewLayout> layout_;
   MockBrowserViewLayoutDelegate* delegate_;  // Owned by |layout_|.
-  std::unique_ptr<MockView> root_view_;
+  std::unique_ptr<views::View> root_view_;
 
   // Views owned by |root_view_|.
-  MockView* top_container_;
+  views::View* top_container_;
   TabStrip* tab_strip_;
-  MockView* toolbar_;
+  views::View* toolbar_;
   InfoBarContainerView* infobar_container_;
-  MockView* contents_container_;
-  MockView* contents_web_view_;
-  MockView* devtools_web_view_;
+  views::View* contents_container_;
+  views::View* contents_web_view_;
+  views::View* devtools_web_view_;
 
   std::unique_ptr<MockImmersiveModeController> immersive_mode_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewLayoutTest);
 };
 
 // Test basic construction and initialization.
 TEST_F(BrowserViewLayoutTest, BrowserViewLayout) {
   EXPECT_TRUE(layout()->browser());
   EXPECT_TRUE(layout()->GetWebContentsModalDialogHost());
@@ skipping 22 matching lines @@
   // Now the toolbar has bounds and other views shift down.
   EXPECT_EQ("0,0 0x0", tab_strip()->bounds().ToString());
   EXPECT_EQ("0,0 800x30", toolbar()->bounds().ToString());
   EXPECT_EQ("0,30 800x0", infobar_container()->bounds().ToString());
   EXPECT_EQ("0,30 800x570", contents_container()->bounds().ToString());
 
   // TODO(jamescook): Tab strip and bookmark bar.
 }
 
 TEST_F(BrowserViewLayoutTest, LayoutDownloadShelf) {
-  std::unique_ptr<MockView> download_shelf(new MockView(gfx::Size(800, 50)));
+  std::unique_ptr<views::View> download_shelf(
+      CreateFixedSizeView(gfx::Size(800, 50)));
   layout()->set_download_shelf(download_shelf.get());
 
   // If download shelf doesn't need layout, it doesn't move the bottom edge.
   delegate()->set_download_shelf_needs_layout(false);
   const int kBottom = 500;
   EXPECT_EQ(kBottom, layout()->LayoutDownloadShelf(kBottom));
 
   // Download shelf layout moves up the bottom edge and sets visibility.
   delegate()->set_download_shelf_needs_layout(true);
   download_shelf->SetVisible(false);
   EXPECT_EQ(450, layout()->LayoutDownloadShelf(kBottom));
   EXPECT_TRUE(download_shelf->visible());
   EXPECT_EQ("0,450 0x50", download_shelf->bounds().ToString());
 }