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

Unified Diff: ash/accelerators/accelerator_interactive_uitest_chromeos.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase Created 3 years, 9 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/accelerators/accelerator_interactive_uitest_chromeos.cc
diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
index 44693ce92d13b5efc4b6d673bfda75c7a9a29897..4e8d25ce1fd5c70e966563d764272be62a09ead8 100644
--- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
+++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
@@ -18,7 +18,6 @@
#include "base/run_loop.h"
#include "base/test/user_action_tester.cc"
#include "chromeos/network/network_handler.h"
-#include "mojo/edk/embedder/embedder.h"
#include "ui/app_list/presenter/app_list.h"
#include "ui/app_list/presenter/test/test_app_list_presenter.h"
#include "ui/base/test/ui_controls.h"
@@ -198,7 +197,6 @@ TEST_F(AcceleratorInteractiveUITest, MAYBE_ChromeOsAccelerators) {
// Tests the app list accelerator.
TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {
- mojo::edk::Init();
xiyuan 2017/03/17 07:08:15 Removed because mojo init is added to AshInteracti
app_list::test::TestAppListPresenter test_app_list_presenter;
Shell::Get()->app_list()->SetAppListPresenter(
test_app_list_presenter.CreateInterfacePtrAndBind());

Powered by Google App Engine
This is Rietveld 408576698