diff options
| -rw-r--r-- | chrome/browser/extensions/script_badge_controller_unittest.cc | 9 | ||||
| -rw-r--r-- | chrome/common/extensions/feature_switch.cc | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc index c6ec141..9d226ba 100644 --- a/chrome/browser/extensions/script_badge_controller_unittest.cc +++ b/chrome/browser/extensions/script_badge_controller_unittest.cc @@ -203,15 +203,6 @@ 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 } } diff --git a/chrome/common/extensions/feature_switch.cc b/chrome/common/extensions/feature_switch.cc index 6ed8ed5..7a7a1d2 100644 --- a/chrome/common/extensions/feature_switch.cc +++ b/chrome/common/extensions/feature_switch.cc @@ -31,11 +31,7 @@ class CommonSwitches { FeatureSwitch::DEFAULT_DISABLED), script_bubble( switches::kScriptBubble, -#if !defined(OS_MACOSX) FeatureSwitch::DEFAULT_ENABLED), -#else - FeatureSwitch::DEFAULT_DISABLED), -#endif sideload_wipeout( switches::kSideloadWipeout, base::FieldTrialList::FindFullName("SideloadWipeout") == "Enabled" ? |