Chromium Code Reviews| Index: ui/views/cocoa/bridged_native_widget_unittest.mm |
| diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm |
| index b86413443f2d11ef2020e885267f69aa375e7036..9e74e5d366da5c4cbfef9f25a6a3f1816cae9b32 100644 |
| --- a/ui/views/cocoa/bridged_native_widget_unittest.mm |
| +++ b/ui/views/cocoa/bridged_native_widget_unittest.mm |
| @@ -19,6 +19,8 @@ |
| #import "testing/gtest_mac.h" |
| #import "ui/base/cocoa/window_size_constants.h" |
| #include "ui/base/ime/input_method.h" |
| +#include "ui/base/material_design/material_design_controller.h" |
| +#include "ui/base/test/material_design_controller_test_api.h" |
| #include "ui/events/test/cocoa_test_event_utils.h" |
| #import "ui/gfx/mac/coordinate_conversion.h" |
| #import "ui/gfx/test/ui_cocoa_test_helper.h" |
| @@ -239,6 +241,7 @@ class BridgedNativeWidgetTestBase : public ui::CocoaTest { |
| // Overridden from testing::Test: |
| void SetUp() override { |
| ui::CocoaTest::SetUp(); |
| + ui::MaterialDesignController::Initialize(); |
| init_params_.native_widget = native_widget_mac_; |
| @@ -258,6 +261,10 @@ class BridgedNativeWidgetTestBase : public ui::CocoaTest { |
| native_widget_mac_->GetWidget()->Init(init_params_); |
| } |
| + void TearDown() override { |
| + ui::test::MaterialDesignControllerTestAPI::Uninitialize(); |
| + } |
|
tapted
2016/08/09 01:35:13
ui::CocoaTest::TearDown() after the ::Uninitialize
Evan Stade
2016/08/09 01:39:28
thanks, done
|
| + |
| protected: |
| std::unique_ptr<Widget> widget_; |
| MockNativeWidgetMac* native_widget_mac_; // Weak. Owned by |widget_|. |