| Index: ash/test/ash_test_helper.cc
|
| diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
|
| index 54a50bf644c5f42d0deba0b38f277ba34d6162ca..ac80264797a1b23043e93230fedcea56cf35c799 100644
|
| --- a/ash/test/ash_test_helper.cc
|
| +++ b/ash/test/ash_test_helper.cc
|
| @@ -88,7 +88,7 @@ void AshTestHelper::SetUp(bool start_session) {
|
| // WindowManager creates WMState for mash.
|
| if (config_ == Config::CLASSIC)
|
| wm_state_ = base::MakeUnique<::wm::WMState>();
|
| - views_delegate_ = ash_test_environment_->CreateViewsDelegate();
|
| + test_views_delegate_ = ash_test_environment_->CreateViewsDelegate();
|
|
|
| // Disable animations during tests.
|
| zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
|
| @@ -217,7 +217,7 @@ void AshTestHelper::TearDown() {
|
| ui::ShutdownInputMethodForTesting();
|
| zero_duration_mode_.reset();
|
|
|
| - views_delegate_.reset();
|
| + test_views_delegate_.reset();
|
| wm_state_.reset();
|
|
|
| // WindowManager owns the CaptureController for mus/mash.
|
|
|