| Index: chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
|
| diff --git a/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc b/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
|
| index 8a45cf28b4b9c19b64c576eb54e077a408540477..82b17dc84e782510d2ded5b89a069bd990de96a2 100644
|
| --- a/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
|
| +++ b/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
|
| @@ -243,9 +243,6 @@ TEST_F(LauncherUpdaterTest, PanelItem) {
|
| updater.Init();
|
| ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
|
| EXPECT_EQ(ash::TYPE_APP_PANEL, GetItem(&updater).type);
|
| - ash::LauncherID id = GetItem(&updater).id;
|
| - EXPECT_EQ(ChromeLauncherDelegate::APP_TYPE_APP_PANEL,
|
| - launcher_delegate_->GetAppType(id));
|
| EXPECT_EQ(static_cast<void*>(NULL), updater.favicon_loader_.get());
|
| }
|
|
|
| @@ -263,9 +260,6 @@ TEST_F(LauncherUpdaterTest, PanelItem) {
|
| updater.Init();
|
| ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
|
| EXPECT_EQ(ash::TYPE_APP_PANEL, GetItem(&updater).type);
|
| - ash::LauncherID id = GetItem(&updater).id;
|
| - EXPECT_EQ(ChromeLauncherDelegate::APP_TYPE_EXTENSION_PANEL,
|
| - launcher_delegate_->GetAppType(id));
|
| EXPECT_NE(static_cast<void*>(NULL), updater.favicon_loader_.get());
|
| }
|
| }
|
| @@ -278,8 +272,7 @@ TEST_F(LauncherUpdaterTest, PersistPinned) {
|
| app_icon_loader_->SetAppID(&tab1, "1");
|
|
|
| app_icon_loader_->GetAndClearFetchCount();
|
| - launcher_delegate_->PinAppWithID("1",
|
| - ChromeLauncherDelegate::APP_TYPE_WINDOW);
|
| + launcher_delegate_->PinAppWithID("1");
|
| EXPECT_GT(app_icon_loader_->GetAndClearFetchCount(), 0);
|
| EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
|
| launcher_model_->items()[1].type);
|
|
|