chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc - Issue 2106663004: arc: Initial implemetation of Chrome sync for Arc packages.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2106663004: arc: Initial implemetation of Chrome sync for Arc packages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Issue Fixed. 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

« chrome/browser/ui/app_list/arc/arc_app_test.cc ('K') | « chrome/browser/ui/app_list/arc/arc_package_syncable_service_factory.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 aaffb51ce7a069bef180f9b4c2d7fd7c5aec3cea..31813943a1a51eaaeed6286751eb2ece90936489 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

@@ -80,7 +80,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"

@@ -1782,7 +1781,7 @@ TEST_F(ChromeLauncherControllerImplTest, ArcDeferredLaunch) {

SendListOfArcApps();

- arc_test_.bridge_service()->SetStopped();

+ arc_test_.SetBridgeServiceStopped();

EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id1));

EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id2));

@@ -1818,7 +1817,7 @@ TEST_F(ChromeLauncherControllerImplTest, ArcDeferredLaunch) {

EXPECT_EQ(shelf_id_app_3,

launcher_controller_->GetShelfIDForAppID(arc_app_id3));

- arc_test_.bridge_service()->SetReady();

+ arc_test_.ResetBridgeServiceReady();

SendListOfArcApps();

base::RunLoop().RunUntilIdle();

@@ -1859,7 +1858,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_.SetBridgeServiceStopped();

base::RunLoop().RunUntilIdle();

EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id));

}