Chromium Code Reviews| Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc |
| diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc |
| index 1d0f219a09bdd0966bd8ae6cf4e21f33053b0fea..4180aa7baa8e46baf1a776fed617f336c28fa60c 100644 |
| --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc |
| +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc |
| @@ -11,6 +11,8 @@ |
| #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" |
| @@ -139,6 +141,11 @@ class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase { |
| 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_
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()); |