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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2205843004: [Merge to M53] arc: Initial implemetation of Chrome sync for Arc packages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
index 305cd78c8cd21806d1996080f8d48539921df92b..baf4ba699491da2f5397a23f0aae9f6ffeb3de7b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -79,7 +79,6 @@
#include "chromeos/chromeos_switches.h"
#include "components/arc/common/app.mojom.h"
#include "components/arc/test/fake_app_instance.h"
-#include "components/arc/test/fake_arc_bridge_service.h"
#include "components/exo/shell_surface.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/syncable_prefs/testing_pref_service_syncable.h"
@@ -1781,7 +1780,7 @@ TEST_F(ChromeLauncherControllerImplTest, ArcDeferredLaunch) {
SendListOfArcApps();
- arc_test_.bridge_service()->SetStopped();
+ arc_test_.StopArcInstance();
EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id1));
EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id2));
@@ -1817,7 +1816,7 @@ TEST_F(ChromeLauncherControllerImplTest, ArcDeferredLaunch) {
EXPECT_EQ(shelf_id_app_3,
launcher_controller_->GetShelfIDForAppID(arc_app_id3));
- arc_test_.bridge_service()->SetReady();
+ arc_test_.RestartArcInstance();
SendListOfArcApps();
base::RunLoop().RunUntilIdle();
@@ -1858,7 +1857,7 @@ TEST_F(ChromeLauncherControllerImplTest, ArcRunningApp) {
// Stopping bridge removes apps.
arc_test_.app_instance()->SendTaskCreated(3, arc_test_.fake_apps()[0]);
EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(arc_app_id));
- arc_test_.bridge_service()->SetStopped();
+ arc_test_.StopArcInstance();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id));
}
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_package_syncable_service_factory.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698