Rework OpaqueBrowserFrameViewLayout.

chrome/browser/ui/views/frame/opaque_browser_frame_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/opaque_browser_frame_view_layout.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
@@ skipping 224 matching lines @@
   // titles, and a tabstrip.
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
 
   // After some visual inspection, it really does look like the tabstrip is
   // initally positioned out of our view.
   EXPECT_EQ("-1,13 398x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
-  EXPECT_EQ("226x73", layout_manager_->GetMinimumSize(kWidth).ToString());
+  EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // A normal window with no window icon still produces icon bounds for
   // Windows, which has a hidden icon that a user can double click on to close
   // the window.
   EXPECT_EQ("6,4 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, BasicWindowMaximized) {
   // Tests the layout of a default chrome window with no avatars, no window
   // titles, and a tabstrip, but maximized this time.
   delegate_->SetWindowState(TestLayoutDelegate::STATE_MAXIMIZED);
   root_view_->Layout();
 
   // Note how the bonds start at the exact top of the window while maximized
   // while they start 1 pixel below when unmaximized.
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("403,0 26x18", minimize_button_->bounds().ToString());
   EXPECT_EQ("429,0 25x18", restore_button_->bounds().ToString());
   EXPECT_EQ("454,0 46x18", close_button_->bounds().ToString());
 
-  EXPECT_EQ("-6,-3 393x29",
+  EXPECT_EQ("-5,-3 392x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
-  EXPECT_EQ("231x61", layout_manager_->GetMinimumSize(kWidth).ToString());
+  EXPECT_EQ("262x61", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // In the maximized case, OpaqueBrowserFrameView::NonClientHitTest() uses
   // this rect, extended to the top left corner of the window.
   EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WithWindowTitleAndIcon) {
   // Tests the layout of pop up windows.
   delegate_->SetWindowTitle(ASCIIToUTF16("Window Title"));
   AddWindowTitleIcons();
@@ skipping 12 matching lines @@
   AddAvatarButton();
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
 
   // Check the location of the avatar
   EXPECT_EQ("7,11 40x29", menu_button_->bounds().ToString());
   EXPECT_EQ("45,13 352x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
-  EXPECT_EQ("226x73", layout_manager_->GetMinimumSize(kWidth).ToString());
+  EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 }