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 108 matching lines @@
 
 }  // namespace
 
 class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase {
  public:
   OpaqueBrowserFrameViewLayoutTest() {}
   ~OpaqueBrowserFrameViewLayoutTest() override {}
 
   void SetUp() override {
     views::ViewsTestBase::SetUp();
+    // Set up a test profiler manager so that
+    // ProfileManager::GetProfileInfoCache won't crash when constructing

[msw, 2015/04/16 22:53:34]

Can you make AvatarBaseButton work when g_browser_process->profile_manager() is
null and comment that it may be null in tests? I think that is better design
than forcing the frame layout tests to construct a test profile manager.

[yao, 2015/05/04 17:30:06]

Done.

+    // and destructing AvatarBaseButton.
+    TestingProfileManager profile_manager_(TestingBrowserProcess::GetGlobal());
+    ASSERT_TRUE(profile_manager_.SetUp());
 
     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 392 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