[Win] Redesign the new avatar button.

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/profiles/avatar_label.h"
@@ skipping 510 matching lines @@
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WindowWithNewAvatar) {
   // Tests a normal tabstrip window with the new style avatar icon.
   AddNewAvatarButton();
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
 
   // Check the location of the avatar button.
   EXPECT_EQ("385,1 12x18", new_avatar_button_->bounds().ToString());
-  // The basic window bounds are (-1, 13 398x29). There should not be an icon
-  // avatar in the left, and the new avatar button has an offset of 5 to its
-  // next control.
-  EXPECT_EQ("-1,13 381x29",
+  // The new tab button is 39px wide and slides completely under the new
+  // avatar button, thus increasing the tabstrip by that amount.
+  EXPECT_EQ("-1,13 420x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WindowWithAvatarLabelAndButtonOnLeft) {
   AddAvatarLabel();
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
 
   // 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());
 }