Fix regression in showing bookmark star when an extension should override it

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index e8fb04c9618407791ee2be2785b677af2c3127a6..90cbbc4f88b71f0031ac4e1695526f02bdff2d20 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -224,6 +224,10 @@ void LocationBarViewMac::InvalidatePageActions() {
   Layout();
 }
 
+void LocationBarViewMac::UpdateBookmarkStarVisibility() {
+  star_decoration_->SetVisible(IsStarEnabled());
+}
+
 bool LocationBarViewMac::ShowPageActionPopup(
     const extensions::Extension* extension, bool grant_active_tab) {
   for (ScopedVector<PageActionDecoration>::iterator iter =
@@ -313,7 +317,7 @@ bool LocationBarViewMac::GetBookmarkStarVisibility() {
 
 void LocationBarViewMac::SetEditable(bool editable) {
   [field_ setEditable:editable ? YES : NO];
-  UpdateStarDecorationVisibility();
+  UpdateBookmarkStarVisibility();
   UpdateZoomDecoration();
   UpdatePageActions();
   Layout();
@@ -328,7 +332,7 @@ void LocationBarViewMac::SetStarred(bool starred) {
     return;
 
   star_decoration_->SetStarred(starred);
-  UpdateStarDecorationVisibility();
+  UpdateBookmarkStarVisibility();
   OnDecorationsChanged();
 }
 
@@ -528,7 +532,7 @@ NSPoint LocationBarViewMac::GetPageActionBubblePoint(
 
 void LocationBarViewMac::Update(const WebContents* contents) {
   UpdateManagePasswordsIconAndBubble();
-  UpdateStarDecorationVisibility();
+  UpdateBookmarkStarVisibility();
   UpdateTranslateDecoration();
   UpdateZoomDecoration();
   RefreshPageActionDecorations();
@@ -658,7 +662,7 @@ void LocationBarViewMac::DeletePageActionDecorations() {
 }
 
 void LocationBarViewMac::OnEditBookmarksEnabledChanged() {
-  UpdateStarDecorationVisibility();
+  UpdateBookmarkStarVisibility();
   OnChanged();
 }
 
@@ -756,10 +760,6 @@ bool LocationBarViewMac::UpdateZoomDecoration() {
       ZoomController::FromWebContents(web_contents));
 }
 
-void LocationBarViewMac::UpdateStarDecorationVisibility() {
-  star_decoration_->SetVisible(IsStarEnabled());
-}
-
 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
   bool is_visible = !GetToolbarModel()->input_in_progress() &&
                     browser_->search_model()->voice_search_supported();