Make the getAttention badge grey.

chrome/common/extensions/extension_action_unittest.cc

Index: chrome/common/extensions/extension_action_unittest.cc
diff --git a/chrome/common/extensions/extension_action_unittest.cc b/chrome/common/extensions/extension_action_unittest.cc
index ad4db52a622320cb60a1e5c9127052b3035ca141..449ecf4a0f434d00c6a4e49ff97341bbb623001e 100644
--- a/chrome/common/extensions/extension_action_unittest.cc
+++ b/chrome/common/extensions/extension_action_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_action.h"
@@ -112,19 +113,49 @@ TEST_F(ExtensionActionTest, IconIndex) {
 }
 
 TEST_F(ExtensionActionTest, Visibility) {
+  // Supports the icon animation.
+  MessageLoop message_loop;
+
   ASSERT_FALSE(action.GetIsVisible(1));
-  action.SetIsVisible(ExtensionAction::kDefaultTabId, true);
+  EXPECT_FALSE(action.GetIconAnimation(ExtensionAction::kDefaultTabId));
+  action.SetAppearance(ExtensionAction::kDefaultTabId, ExtensionAction::ACTIVE);
   ASSERT_TRUE(action.GetIsVisible(1));
   ASSERT_TRUE(action.GetIsVisible(100));
-  action.SetIsVisible(ExtensionAction::kDefaultTabId, false);
+  EXPECT_FALSE(action.GetIconAnimation(ExtensionAction::kDefaultTabId));
+
+  action.SetAppearance(ExtensionAction::kDefaultTabId,
+                       ExtensionAction::INVISIBLE);
   ASSERT_FALSE(action.GetIsVisible(1));
   ASSERT_FALSE(action.GetIsVisible(100));
-  action.SetIsVisible(100, true);
+  EXPECT_FALSE(action.GetIconAnimation(100));
+  action.SetAppearance(100, ExtensionAction::ACTIVE);
   ASSERT_FALSE(action.GetIsVisible(1));
   ASSERT_TRUE(action.GetIsVisible(100));
+  EXPECT_TRUE(action.GetIconAnimation(100));
+
   action.ClearAllValuesForTab(100);
   ASSERT_FALSE(action.GetIsVisible(1));
   ASSERT_FALSE(action.GetIsVisible(100));
+  EXPECT_FALSE(action.GetIconAnimation(100));
+}
+
+TEST_F(ExtensionActionTest, GetAttention) {
+  // Supports the icon animation.
+  MessageLoop message_loop;
+
+  ASSERT_FALSE(action.GetIsVisible(1));

[not at google - send to devlin, 2012/08/02 15:38:09]

why are some of these ASSERT and others EXPECT? Seems like they could all be
EXPECT.

[Jeffrey Yasskin, 2012/08/02 15:55:56]

Some were copied from the previous test. They're all EXPECTs now.

+  EXPECT_FALSE(action.GetIconAnimation(1));
+  action.SetAppearance(1, ExtensionAction::GETTING_ATTENTION);
+  ASSERT_TRUE(action.GetIsVisible(1));
+  EXPECT_TRUE(action.GetIconAnimation(1));
+
+  // Simulate waiting long enough for the animation to end.
+  action.GetIconAnimation(1)->Stop();
+  EXPECT_FALSE(action.GetIconAnimation(1));  // Sanity check.
+
+  action.SetAppearance(1, ExtensionAction::ACTIVE);
+  EXPECT_FALSE(action.GetIconAnimation(1))
+      << "The animation should not play again if the icon was already visible.";
 }
 
 TEST_F(ExtensionActionTest, Badge) {