Move page actions over to ExtensionAction2

chrome/common/extensions/extension_action2_unittest.cc

 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_action2.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/image_decoder.h"
 
 static SkBitmap LoadIcon(const std::string& filename) {
@@ skipping 47 matching lines @@
   // icon
   SkBitmap icon1 = LoadIcon("icon1.png");
   SkBitmap icon2 = LoadIcon("icon2.png");
   ASSERT_TRUE(action.GetIcon(1).isNull());
   action.SetIcon(ExtensionAction2::kDefaultTabId, icon1);
   ASSERT_TRUE(BitmapsAreEqual(icon1, action.GetIcon(100)));
   action.SetIcon(100, icon2);
   ASSERT_TRUE(BitmapsAreEqual(icon1, action.GetIcon(1)));
   ASSERT_TRUE(BitmapsAreEqual(icon2, action.GetIcon(100)));
 
+  // icon index
+  ASSERT_EQ(-1, action.GetIconIndex(1));
+  action.icon_paths()->push_back("foo.png");
+  action.icon_paths()->push_back("bar.png");
+  action.SetIconIndex(ExtensionAction2::kDefaultTabId, 1);
+  ASSERT_EQ(1, action.GetIconIndex(1));
+  ASSERT_EQ(1, action.GetIconIndex(100));
+  action.SetIconIndex(100, 0);
+  ASSERT_EQ(0, action.GetIconIndex(100));
+  ASSERT_EQ(1, action.GetIconIndex(1));
+  action.ClearAllValuesForTab(100);
+  ASSERT_EQ(1, action.GetIconIndex(100));
+  ASSERT_EQ(1, action.GetIconIndex(1));
+
+  // visibility
+  ASSERT_EQ(false, action.GetIsVisible(1));
+  action.SetIsVisible(ExtensionAction2::kDefaultTabId, true);
+  ASSERT_EQ(true, action.GetIsVisible(1));
+  ASSERT_EQ(true, action.GetIsVisible(100));
+  action.SetIsVisible(ExtensionAction2::kDefaultTabId, false);
+  ASSERT_EQ(false, action.GetIsVisible(1));
+  ASSERT_EQ(false, action.GetIsVisible(100));
+  action.SetIsVisible(100, true);
+  ASSERT_EQ(false, action.GetIsVisible(1));
+  ASSERT_EQ(true, action.GetIsVisible(100));
+  action.ClearAllValuesForTab(100);
+  ASSERT_EQ(false, action.GetIsVisible(1));
+  ASSERT_EQ(false, action.GetIsVisible(100));
+
   // badge text
   ASSERT_EQ("", action.GetBadgeText(1));
   action.SetBadgeText(ExtensionAction2::kDefaultTabId, "foo");
   ASSERT_EQ("foo", action.GetBadgeText(1));
   ASSERT_EQ("foo", action.GetBadgeText(100));
   action.SetBadgeText(100, "bar");
   ASSERT_EQ("foo", action.GetBadgeText(1));
   ASSERT_EQ("bar", action.GetBadgeText(100));
   action.SetBadgeText(ExtensionAction2::kDefaultTabId, "baz");
   ASSERT_EQ("baz", action.GetBadgeText(1));
   action.ClearAllValuesForTab(100);
   ASSERT_EQ("baz", action.GetBadgeText(100));
 
   // badge text color
   ASSERT_EQ(0x00000000u, action.GetBadgeTextColor(1));
-  action.SetBadgeTextColor(ExtensionAction2::kDefaultTabId, 0xFFFF0000);
+  action.SetBadgeTextColor(ExtensionAction2::kDefaultTabId, 0xFFFF0000u);
   ASSERT_EQ(0xFFFF0000u, action.GetBadgeTextColor(1));
   ASSERT_EQ(0xFFFF0000u, action.GetBadgeTextColor(100));
   action.SetBadgeTextColor(100, 0xFF00FF00);
   ASSERT_EQ(0xFFFF0000u, action.GetBadgeTextColor(1));
   ASSERT_EQ(0xFF00FF00u, action.GetBadgeTextColor(100));
-  action.SetBadgeTextColor(ExtensionAction2::kDefaultTabId, 0xFF0000FF);
+  action.SetBadgeTextColor(ExtensionAction2::kDefaultTabId, 0xFF0000FFu);
   ASSERT_EQ(0xFF0000FFu, action.GetBadgeTextColor(1));
   action.ClearAllValuesForTab(100);
   ASSERT_EQ(0xFF0000FFu, action.GetBadgeTextColor(100));
 
   // badge background color
   ASSERT_EQ(0x00000000u, action.GetBadgeBackgroundColor(1));
-  action.SetBadgeBackgroundColor(ExtensionAction2::kDefaultTabId, 0xFFFF0000);
+  action.SetBadgeBackgroundColor(ExtensionAction2::kDefaultTabId,
+                                 0xFFFF0000u);
   ASSERT_EQ(0xFFFF0000u, action.GetBadgeBackgroundColor(1));
   ASSERT_EQ(0xFFFF0000u, action.GetBadgeBackgroundColor(100));
   action.SetBadgeBackgroundColor(100, 0xFF00FF00);
   ASSERT_EQ(0xFFFF0000u, action.GetBadgeBackgroundColor(1));
   ASSERT_EQ(0xFF00FF00u, action.GetBadgeBackgroundColor(100));
-  action.SetBadgeBackgroundColor(ExtensionAction2::kDefaultTabId, 0xFF0000FF);
+  action.SetBadgeBackgroundColor(ExtensionAction2::kDefaultTabId,
+                                 0xFF0000FFu);
   ASSERT_EQ(0xFF0000FFu, action.GetBadgeBackgroundColor(1));
   action.ClearAllValuesForTab(100);
   ASSERT_EQ(0xFF0000FFu, action.GetBadgeBackgroundColor(100));
 }
-
-TEST(ExtensionAction2Test, IconOddCases) {
-  ExtensionAction2 action;
-
-  action.SetIcon(ExtensionAction2::kDefaultTabId, LoadIcon("icon1.png"));
-  action.SetDefaultIcon("foo.png");
-  ASSERT_TRUE(action.GetIcon(1).isNull());
-  ASSERT_EQ("foo.png", action.GetDefaultIconPath());
-
-  action.icon_paths()->push_back("a.png");
-  action.icon_paths()->push_back("b.png");
-  action.SetDefaultIcon(1);
-  ASSERT_TRUE(action.GetIcon(1).isNull());
-  ASSERT_EQ("b.png", action.GetDefaultIconPath());
-
-  action.SetIcon(100, LoadIcon("icon1.png"));
-  ASSERT_TRUE(!action.GetIcon(100).isNull());
-  action.SetIcon(ExtensionAction2::kDefaultTabId, LoadIcon("icon1.png"));
-  ASSERT_TRUE(!action.GetIcon(1).isNull());
-  ASSERT_EQ("", action.GetDefaultIconPath());
-}