Reland 152221 - chromeos: Sync animation.

ash/launcher/launcher_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/launcher/launcher.h"
@@ skipping 518 matching lines @@
   LauncherItem item = GetItemByID(last_added);
   int index = model_->ItemIndexByID(last_added);
   internal::LauncherButton* button = GetButtonByID(last_added);
   ASSERT_EQ(internal::LauncherButton::STATE_RUNNING, button->state());
   item.status = ash::STATUS_ACTIVE;
   model_->Set(index, item);
   ASSERT_EQ(internal::LauncherButton::STATE_ACTIVE, button->state());
   item.status = ash::STATUS_ATTENTION;
   model_->Set(index, item);
   ASSERT_EQ(internal::LauncherButton::STATE_ATTENTION, button->state());
-  item.status = ash::STATUS_IS_PENDING;
-  model_->Set(index, item);
-  ASSERT_EQ(internal::LauncherButton::STATE_PENDING, button->state());
 }
 
 // Confirm that item status changes are reflected in the buttons
 // for platform apps.
 TEST_F(LauncherViewTest, LauncherItemStatusPlatformApp) {
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add tabbed browser.
   LauncherID last_added = AddPlatformApp();
   LauncherItem item = GetItemByID(last_added);
   int index = model_->ItemIndexByID(last_added);
   internal::LauncherButton* button = GetButtonByID(last_added);
   ASSERT_EQ(internal::LauncherButton::STATE_RUNNING, button->state());
   item.status = ash::STATUS_ACTIVE;
   model_->Set(index, item);
   ASSERT_EQ(internal::LauncherButton::STATE_ACTIVE, button->state());
   item.status = ash::STATUS_ATTENTION;
   model_->Set(index, item);
   ASSERT_EQ(internal::LauncherButton::STATE_ATTENTION, button->state());
-  item.status = ash::STATUS_IS_PENDING;
-  model_->Set(index, item);
-  ASSERT_EQ(internal::LauncherButton::STATE_PENDING, button->state());
 }
 
 TEST_F(LauncherViewTest, LauncherTooltipTest) {
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Prepare some items to the launcher.
   LauncherID app_button_id = AddAppShortcut();
   LauncherID tab_button_id = AddTabbedBrowser();
 
@@ skipping 126 matching lines @@
   const int app_list_button_index = test_api_->GetButtonCount() - 1;
   const gfx::Rect& app_list_ideal_bounds =
       test_api_->GetIdealBoundsByIndex(app_list_button_index);
   const gfx::Rect& app_list_bounds =
       test_api_->GetBoundsByIndex(app_list_button_index);
   EXPECT_EQ(app_list_bounds, app_list_ideal_bounds);
 }
 
 }  // namespace test
 }  // namespace ash