Refactor OpaqueBrowserFrameView; reduce uses of kUseSystemTitleBar.

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/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/avatar_label.h"
@@ skipping 344 matching lines @@
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // If the buttons are on the left, there should be no hidden icon for the user
   // to double click.
   EXPECT_EQ("0,0 0x0", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WithoutCaptionButtons) {
-  // Tests the layout of a default chrome window with no caption buttons.
+  // Tests the layout of a default chrome window with no caption buttons (which
+  // should force the tab strip to be condensed).
   delegate_->SetShouldShowCaptionButtons(false);
   root_view_->Layout();
 
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", minimize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", restore_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", close_button_->bounds().ToString());
 
-  EXPECT_EQ("-1,13 492x29",
+  EXPECT_EQ("-5,-3 500x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
-  EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
+  EXPECT_EQ("251x61", 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());
+  EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, MaximizedWithoutCaptionButtons) {
   // Tests the layout of a maximized chrome window with no caption buttons.
   delegate_->SetWindowState(TestLayoutDelegate::STATE_MAXIMIZED);
   delegate_->SetShouldShowCaptionButtons(false);
   root_view_->Layout();
 
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", minimize_button_->bounds().ToString());
@@ skipping 86 matching lines @@
   // If the buttons are on the left, there should be no hidden icon for the user
   // to double click.
   EXPECT_EQ("0,0 0x0", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest,
        WindowWithAvatarWithoutCaptionButtonsOnLeft) {
   // Tests the layout of a chrome window with an avatar icon and no caption
   // buttons. However, the caption buttons *would* be on the left if they
   // weren't hidden, and therefore, the avatar icon should be on the right.
+  // The lack of caption buttons should force the tab strip to be condensed.
   AddAvatarButton();
   std::vector<views::FrameButton> leading_buttons;
   std::vector<views::FrameButton> trailing_buttons;
   leading_buttons.push_back(views::FRAME_BUTTON_CLOSE);
   leading_buttons.push_back(views::FRAME_BUTTON_MINIMIZE);
   leading_buttons.push_back(views::FRAME_BUTTON_MAXIMIZE);
   layout_manager_->SetButtonOrdering(leading_buttons, trailing_buttons);
   delegate_->SetShouldShowCaptionButtons(false);
   root_view_->Layout();
 
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", minimize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", restore_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", close_button_->bounds().ToString());
 
   // Check the location of the avatar
-  EXPECT_EQ("454,11 40x29", menu_button_->bounds().ToString());
-  EXPECT_EQ("-1,13 450x29",
+  EXPECT_EQ("458,0 40x24", menu_button_->bounds().ToString());
+  EXPECT_EQ("-5,-3 458x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
-  EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
+  EXPECT_EQ("251x61", 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());
+  EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WindowWithNewAvatar) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kNewProfileManagement);
 
   // Tests a normal tabstrip window with the new style avatar icon.
   AddNewAvatarButton();
   root_view_->Layout();
 
@@ skipping 18 matching lines @@
 
   // Check the location of the avatar label relative to the avatar button if
   // both are displayed on the left side.
   // The label height and width depends on the font size and the text displayed.
   // This may possibly change, so we don't test it here.
   EXPECT_EQ(menu_button_->bounds().x() - 2, avatar_label_->bounds().x());
   EXPECT_EQ(
       menu_button_->bounds().bottom() - 3 - avatar_label_->bounds().height(),
       avatar_label_->bounds().y());
 }