diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-02 15:59:47 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-02 15:59:47 +0000 |
| commit | cdf3573edb04f09736e68cc858f1d2533f439cb6 (patch) | |
| tree | 17e3e8e68dba8f78ad29324637011e728db5539b /chrome/browser/extensions/script_badge_controller_unittest.cc | |
| parent | 83eef80d5ea32f96f2842a41ad03f35445ec68f1 (diff) | |
| download | chromium_src-cdf3573edb04f09736e68cc858f1d2533f439cb6.zip chromium_src-cdf3573edb04f09736e68cc858f1d2533f439cb6.tar.gz chromium_src-cdf3573edb04f09736e68cc858f1d2533f439cb6.tar.bz2 | |
Enable script bubble by default on all but mac.
This is a combination of https://codereview.chromium.org/11308302/ and https://codereview.chromium.org/11434064/, with some fixes to tests.
BUG=153137
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/11411308
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/script_badge_controller_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/script_badge_controller_unittest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc index 5786ccd..c6ec141 100644 --- a/chrome/browser/extensions/script_badge_controller_unittest.cc +++ b/chrome/browser/extensions/script_badge_controller_unittest.cc @@ -203,7 +203,15 @@ TEST_F(ScriptBadgeControllerTest, FragmentNavigation) { EXPECT_THAT(script_badge_controller_->GetCurrentActions(), testing::ElementsAre()); + + // Should be zero, but ScriptBubbleController notifies updates via + // LocationBarController and causes an update here. +#if defined(OS_MACOSX) + // Not enabled on mac yet EXPECT_EQ(0, location_bar_updated.events); +#else + EXPECT_EQ(1, location_bar_updated.events); +#endif } } |