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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.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
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
index 4500e99d61b2c133196bc118ed81a8b7da9922f1..6937aadaff04f6921a1696c1c9805af522217b6b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -19,7 +19,6 @@
#include "ash/shell.h"
#include "ash/test/shelf_test_api.h"
#include "ash/test/shelf_view_test_api.h"
-#include "ash/test/shell_test_api.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/macros.h"
@@ -200,9 +199,7 @@ class LauncherPlatformAppBrowserTest
return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
}
- ash::ShelfModel* shelf_model() {
- return ash::test::ShellTestApi(ash::Shell::GetInstance()).shelf_model();
- }
+ ash::ShelfModel* shelf_model() { return ash::WmShell::Get()->shelf_model(); }
ash::ShelfID CreateAppShortcutLauncherItem(const std::string& name) {
return controller_->CreateAppShortcutLauncherItem(
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698