Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

chrome/browser/extensions/extension_action_unittest.cc

Index: chrome/browser/extensions/extension_action_unittest.cc
diff --git a/chrome/browser/extensions/extension_action_unittest.cc b/chrome/browser/extensions/extension_action_unittest.cc
index 8607c0ce2a12f80b7f1d183ccfe6014c25012295..9a5c3ff1658f792c1a6ea46c0abb768c53d7ea7b 100644
--- a/chrome/browser/extensions/extension_action_unittest.cc
+++ b/chrome/browser/extensions/extension_action_unittest.cc
@@ -4,17 +4,18 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/extension_action.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-using extensions::Extension;
+using extensions::ActionInfo;
 
 TEST(ExtensionActionTest, Title) {
-  Extension::ActionInfo action_info;
+  ActionInfo action_info;
   action_info.default_title = "Initial Title";
-  ExtensionAction action("", Extension::ActionInfo::TYPE_PAGE, action_info);
+  ExtensionAction action("", ActionInfo::TYPE_PAGE, action_info);
 
   ASSERT_EQ("Initial Title", action.GetTitle(1));
   action.SetTitle(ExtensionAction::kDefaultTabId, "foo");
@@ -30,8 +31,8 @@ TEST(ExtensionActionTest, Title) {
 }
 
 TEST(ExtensionActionTest, Visibility) {
-  ExtensionAction action("", Extension::ActionInfo::TYPE_PAGE,
-                         Extension::ActionInfo());
+  ExtensionAction action("", ActionInfo::TYPE_PAGE,
+                         ActionInfo());
 
   ASSERT_FALSE(action.GetIsVisible(1));
   action.SetAppearance(ExtensionAction::kDefaultTabId, ExtensionAction::ACTIVE);
@@ -52,8 +53,8 @@ TEST(ExtensionActionTest, Visibility) {
   ASSERT_FALSE(action.GetIsVisible(1));
   ASSERT_FALSE(action.GetIsVisible(100));
 
-  ExtensionAction browser_action("", Extension::ActionInfo::TYPE_BROWSER,
-                                 Extension::ActionInfo());
+  ExtensionAction browser_action("", ActionInfo::TYPE_BROWSER,
+                                 ActionInfo());
   ASSERT_TRUE(browser_action.GetIsVisible(1));
 }
 
@@ -61,8 +62,8 @@ TEST(ExtensionActionTest, ScriptBadgeAnimation) {
   // Supports the icon animation.
   MessageLoop message_loop;
 
-  ExtensionAction script_badge("", Extension::ActionInfo::TYPE_SCRIPT_BADGE,
-                               Extension::ActionInfo());
+  ExtensionAction script_badge("", ActionInfo::TYPE_SCRIPT_BADGE,
+                               ActionInfo());
   EXPECT_FALSE(script_badge.GetIconAnimation(ExtensionAction::kDefaultTabId));
   script_badge.SetAppearance(ExtensionAction::kDefaultTabId,
                              ExtensionAction::ACTIVE);
@@ -85,8 +86,8 @@ TEST(ExtensionActionTest, GetAttention) {
   // Supports the icon animation.
   scoped_ptr<MessageLoop> message_loop(new MessageLoop);
 
-  ExtensionAction script_badge("", Extension::ActionInfo::TYPE_SCRIPT_BADGE,
-                               Extension::ActionInfo());
+  ExtensionAction script_badge("", ActionInfo::TYPE_SCRIPT_BADGE,
+                               ActionInfo());
   EXPECT_FALSE(script_badge.GetIsVisible(1));
   EXPECT_FALSE(script_badge.GetIconAnimation(1));
   script_badge.SetAppearance(1, ExtensionAction::WANTS_ATTENTION);
@@ -104,9 +105,9 @@ TEST(ExtensionActionTest, GetAttention) {
 }
 
 TEST(ExtensionActionTest, Icon) {
-  Extension::ActionInfo action_info;
+  ActionInfo action_info;
   action_info.default_icon.Add(16, "icon16.png");
-  ExtensionAction page_action("", Extension::ActionInfo::TYPE_PAGE,
+  ExtensionAction page_action("", ActionInfo::TYPE_PAGE,
                               action_info);
   ASSERT_TRUE(page_action.default_icon());
   EXPECT_EQ("icon16.png",
@@ -118,8 +119,8 @@ TEST(ExtensionActionTest, Icon) {
 }
 
 TEST(ExtensionActionTest, Badge) {
-  ExtensionAction action("", Extension::ActionInfo::TYPE_PAGE,
-                         Extension::ActionInfo());
+  ExtensionAction action("", ActionInfo::TYPE_PAGE,
+                         ActionInfo());
   ASSERT_EQ("", action.GetBadgeText(1));
   action.SetBadgeText(ExtensionAction::kDefaultTabId, "foo");
   ASSERT_EQ("foo", action.GetBadgeText(1));
@@ -134,8 +135,8 @@ TEST(ExtensionActionTest, Badge) {
 }
 
 TEST(ExtensionActionTest, BadgeTextColor) {
-  ExtensionAction action("", Extension::ActionInfo::TYPE_PAGE,
-                         Extension::ActionInfo());
+  ExtensionAction action("", ActionInfo::TYPE_PAGE,
+                         ActionInfo());
   ASSERT_EQ(0x00000000u, action.GetBadgeTextColor(1));
   action.SetBadgeTextColor(ExtensionAction::kDefaultTabId, 0xFFFF0000u);
   ASSERT_EQ(0xFFFF0000u, action.GetBadgeTextColor(1));
@@ -150,8 +151,8 @@ TEST(ExtensionActionTest, BadgeTextColor) {
 }
 
 TEST(ExtensionActionTest, BadgeBackgroundColor) {
-  ExtensionAction action("", Extension::ActionInfo::TYPE_PAGE,
-                         Extension::ActionInfo());
+  ExtensionAction action("", ActionInfo::TYPE_PAGE,
+                         ActionInfo());
   ASSERT_EQ(0x00000000u, action.GetBadgeBackgroundColor(1));
   action.SetBadgeBackgroundColor(ExtensionAction::kDefaultTabId,
                                  0xFFFF0000u);
@@ -173,9 +174,9 @@ TEST(ExtensionActionTest, PopupUrl) {
   GURL url_bar("http://www.example.com/bar.html");
   GURL url_baz("http://www.example.com/baz.html");
 
-  Extension::ActionInfo action_info;
+  ActionInfo action_info;
   action_info.default_popup_url = url_foo;
-  ExtensionAction action("", Extension::ActionInfo::TYPE_PAGE, action_info);
+  ExtensionAction action("", ActionInfo::TYPE_PAGE, action_info);
 
   ASSERT_EQ(url_foo, action.GetPopupUrl(1));
   ASSERT_EQ(url_foo, action.GetPopupUrl(100));