chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 10860053: Reland 152221 - chromeos: Sync animation.

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_unittest.cc

Issue 10860053: Reland 152221 - chromeos: Sync animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 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/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.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_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

index 784eda0dbeaa7636df9574ce1910a196430c9ae0..307a4e74bde62b443751a19843b242dcd4f93482 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -172,28 +172,6 @@ TEST_F(ChromeLauncherControllerTest, Policy) {

EXPECT_FALSE(launcher_controller.IsAppPinned(extension3_->id()));

}

-TEST_F(ChromeLauncherControllerTest, UnloadAndLoad) {

- extension_service_->AddExtension(extension3_.get());

- extension_service_->AddExtension(extension4_.get());

- ChromeLauncherController launcher_controller(profile_.get(), &model_);

- launcher_controller.Init();

- EXPECT_TRUE(launcher_controller.IsAppPinned(extension3_->id()));

- EXPECT_TRUE(launcher_controller.IsAppPinned(extension4_->id()));

- extension_service_->UnloadExtension(extension3_->id(),

- extension_misc::UNLOAD_REASON_UPDATE);

- EXPECT_TRUE(launcher_controller.IsAppPinned(extension3_->id()));

- EXPECT_EQ(ash::STATUS_IS_PENDING, model_.items()[1].status);

- extension_service_->AddExtension(extension3_.get());

- EXPECT_TRUE(launcher_controller.IsAppPinned(extension3_->id()));

- EXPECT_EQ(ash::STATUS_CLOSED, model_.items()[1].status);

- EXPECT_TRUE(launcher_controller.IsAppPinned(extension4_->id()));

TEST_F(ChromeLauncherControllerTest, UnpinWithUninstall) {

extension_service_->AddExtension(extension3_.get());

extension_service_->AddExtension(extension4_.get());