diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 06:17:57 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 06:17:57 +0000 |
| commit | 5d246db2292523a348d975ca9d65e786389df14f (patch) | |
| tree | 9d4b515b7bc8516872fc7fb6fdbe9e715843475a /chrome/browser/extensions/browser_action_apitest.cc | |
| parent | 7dc7f0329728dd9d0e11655652a6ec231cb1065d (diff) | |
| download | chromium_src-5d246db2292523a348d975ca9d65e786389df14f.zip chromium_src-5d246db2292523a348d975ca9d65e786389df14f.tar.gz chromium_src-5d246db2292523a348d975ca9d65e786389df14f.tar.bz2 | |
Replace ExtensionAction with ExtensionAction2.
BUG=24472
Review URL: http://codereview.chromium.org/337035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/browser_action_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/browser_action_apitest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index c09e273..a5bd470 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/views/browser_actions_container.h" #include "chrome/browser/views/extensions/extension_popup.h" #include "chrome/browser/views/toolbar_view.h" -#include "chrome/common/extensions/extension_action2.h" +#include "chrome/common/extensions/extension_action.h" #include "chrome/test/ui_test_utils.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserAction) { @@ -35,11 +35,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserAction) { ASSERT_TRUE(catcher.GetNextResult()); // Test that we received the changes. - ExtensionAction2* action = extension->browser_action(); - ASSERT_EQ("Modified", action->GetTitle(ExtensionAction2::kDefaultTabId)); - ASSERT_EQ("badge", action->GetBadgeText(ExtensionAction2::kDefaultTabId)); + ExtensionAction* action = extension->browser_action(); + ASSERT_EQ("Modified", action->GetTitle(ExtensionAction::kDefaultTabId)); + ASSERT_EQ("badge", action->GetBadgeText(ExtensionAction::kDefaultTabId)); ASSERT_EQ(SkColorSetARGB(255, 255, 255, 255), - action->GetBadgeBackgroundColor(ExtensionAction2::kDefaultTabId)); + action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId)); // Simulate the browser action being clicked. ui_test_utils::NavigateToURL(browser(), |