chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc - Issue 2251313002: Revert of arc: Fix crash on Arc window close.

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 2251313002: Revert of arc: Fix crash on Arc window close. (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

« no previous file with comments | « chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc » ('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 ca99f93bcada93362b9d96c497237acf7a175fe8..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

@@ -1845,13 +1845,8 @@

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

// Normal flow, create/destroy tasks.

- std::string window_app_id1("org.chromium.arc.1");

- std::string window_app_id2("org.chromium.arc.2");

- std::string window_app_id3("org.chromium.arc.3");

- CreateArcWindow(window_app_id1);

arc_test_.app_instance()->SendTaskCreated(1, arc_test_.fake_apps()[0]);

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

- CreateArcWindow(window_app_id2);

arc_test_.app_instance()->SendTaskCreated(2, arc_test_.fake_apps()[0]);

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

arc_test_.app_instance()->SendTaskDestroyed(1);

@@ -1860,7 +1855,6 @@

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

// Stopping bridge removes apps.

- CreateArcWindow(window_app_id3);

arc_test_.app_instance()->SendTaskCreated(3, arc_test_.fake_apps()[0]);

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

arc_test_.StopArcInstance();