Chromium Code Reviews| Index: ui/views/test/views_test_base.cc |
| diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc |
| index 53e8683dc50cf3f450c5b1fd0b9c4afb83167e78..7516017edc1210ccbd3cef7b46c800f52cb82d34 100644 |
| --- a/ui/views/test/views_test_base.cc |
| +++ b/ui/views/test/views_test_base.cc |
| @@ -8,6 +8,8 @@ |
| #include "base/run_loop.h" |
| #include "ui/base/clipboard/clipboard.h" |
| +#include "ui/base/material_design/material_design_controller.h" |
| +#include "ui/base/test/material_design_controller_test_api.h" |
| namespace views { |
| @@ -25,6 +27,10 @@ ViewsTestBase::~ViewsTestBase() { |
| void ViewsTestBase::SetUp() { |
| testing::Test::SetUp(); |
| + // ContentTestSuiteBase might have already initialized |
|
sky
2016/04/11 15:32:41
and here
|
| + // MaterialDesignController in unit_tests suite. |
| + ui::test::MaterialDesignControllerTestAPI::UninitializeMode(); |
| + ui::MaterialDesignController::Initialize(); |
| setup_called_ = true; |
| if (!views_delegate_for_setup_) |
| views_delegate_for_setup_.reset(new TestViewsDelegate()); |