summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/page_action_apitest.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 21:23:35 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 21:23:35 +0000
commit67f7191aa0be7791da0c4d9f913b2a90c4eb4dae (patch)
treedaaaf89c0c8f3e8473674282acde2f6e05c14f89 /chrome/browser/extensions/page_action_apitest.cc
parent76ac017bca97c5e45569c43c4aded1e287e2cb0b (diff)
downloadchromium_src-67f7191aa0be7791da0c4d9f913b2a90c4eb4dae.zip
chromium_src-67f7191aa0be7791da0c4d9f913b2a90c4eb4dae.tar.gz
chromium_src-67f7191aa0be7791da0c4d9f913b2a90c4eb4dae.tar.bz2
Port PageActionPopupTest to Linux by filling in missing functionality in locationbarviewgtk.
BUG=30326 TEST=test passes Review URL: http://codereview.chromium.org/507032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/page_action_apitest.cc')
-rw-r--r--chrome/browser/extensions/page_action_apitest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/extensions/page_action_apitest.cc b/chrome/browser/extensions/page_action_apitest.cc
index d7c385d..b545558 100644
--- a/chrome/browser/extensions/page_action_apitest.cc
+++ b/chrome/browser/extensions/page_action_apitest.cc
@@ -133,10 +133,9 @@ public:
bool last_visibility_;
};
-#if !defined(OS_WIN)
-// The following test fails on Mac and Linux because some of page action
-// implementation is missing in LocationBarView
-// (see http://crbug.com/29898, http://crbug.com/30326)
+#if defined(OS_MACOSX)
+// The following test fails on Mac because some of page action implementation is
+// missing in LocationBarView (see http://crbug.com/29898).
#define MAYBE_Show DISABLED_Show
#else
#define MAYBE_Show Show
@@ -166,7 +165,7 @@ IN_PROC_BROWSER_TEST_F(PageActionPopupTest, MAYBE_Show) {
browser()->window()->GetLocationBar()->GetLocationBarForTesting();
ASSERT_EQ(1, location_bar->PageActionVisibleCount());
ExtensionAction* action = location_bar->GetVisiblePageAction(0);
- ASSERT_TRUE(action == last_action_);
+ EXPECT_EQ(action, last_action_);
{
ResultCatcher catcher;