Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2780)

Unified Diff: ash/test/ash_test_helper.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Final feedback addressed Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | chrome/browser/chromeos/accessibility/select_to_speak_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698