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

Unified Diff: ash/wm/panels/panel_window_resizer_unittest.cc

Issue 2183483002: Clean up ash::ShellTestApi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/wm/panels/panel_window_resizer_unittest.cc
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 07406975fbb8b671215fa7f4df48b6e698cce146..fd3fd9ac4002533704ceb7c30d05af41f560e7dd 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -10,6 +10,7 @@
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm_shell.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
@@ -18,7 +19,6 @@
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
-#include "ash/test/shell_test_api.h"
#include "ash/test/test_shelf_delegate.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/window_state_aura.h"
@@ -41,8 +41,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
void SetUp() override {
AshTestBase::SetUp();
UpdateDisplay("600x400");
- test::ShellTestApi test_api(Shell::GetInstance());
- model_ = test_api.shelf_model();
+ model_ = WmShell::Get()->shelf_model();
shelf_delegate_ = test::TestShelfDelegate::instance();
}

Powered by Google App Engine
This is Rietveld 408576698