Refactor the avatar button/icon class

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_menu_button.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/test/views_test_base.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
@@ skipping 103 matching lines @@
   bool show_caption_buttons_;
   WindowState window_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLayoutDelegate);
 };
 
 }  // namespace
 
 class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase {
  public:
-  OpaqueBrowserFrameViewLayoutTest() {}
+  OpaqueBrowserFrameViewLayoutTest()
+      : profile_manager_(TestingBrowserProcess::GetGlobal()) {}

[msw, 2015/04/01 01:30:16]

nit: can you inline this in SetUp and remove the class member?

[yao, 2015/04/10 00:43:32]

Done.

   ~OpaqueBrowserFrameViewLayoutTest() override {}
 
   void SetUp() override {
     views::ViewsTestBase::SetUp();
+    ASSERT_TRUE(profile_manager_.SetUp());

[msw, 2015/04/01 01:30:16]

Why is this necessary? Can you add a comment?

[yao, 2015/04/10 00:43:32]

Done.

 
     delegate_.reset(new TestLayoutDelegate);
     layout_manager_ = new OpaqueBrowserFrameViewLayout(delegate_.get());
     layout_manager_->set_extra_caption_y(0);
     layout_manager_->set_window_caption_spacing(0);
     widget_ = new Widget;
     widget_->Init(CreateParams(Widget::InitParams::TYPE_POPUP));
     root_view_ = widget_->GetRootView();
     root_view_->SetSize(gfx::Size(kWidth, kWidth));
     root_view_->SetLayoutManager(layout_manager_);
@@ skipping 101 matching lines @@
 
   TabIconView* tab_icon_view_;
   views::Label* window_title_;
 
 #if defined(ENABLE_SUPERVISED_USERS)
   SupervisedUserAvatarLabel* supervised_user_avatar_label_;
 #endif
   AvatarMenuButton* menu_button_;
   views::MenuButton* new_avatar_button_;
 
+  TestingProfileManager profile_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayoutTest);
 };
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, BasicWindow) {
   // Tests the layout of a default chrome window with no avatars, no window
   // titles, and a tabstrip.
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
 
@@ skipping 271 matching lines @@
   // 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,
             supervised_user_avatar_label_->bounds().x());
   EXPECT_EQ(menu_button_->bounds().bottom() - 3 -
             supervised_user_avatar_label_->bounds().height(),
             supervised_user_avatar_label_->bounds().y());
 }
 #endif