Add more checks to ShowPageActionPopup

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 9be31772fe3b03f571e1213f59b86495cf007f51..90e4b162575a3b2a6741cbf16175086a9355b144 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -1315,7 +1315,12 @@ bool LocationBarView::ShowPageActionPopup(
   CHECK(extension_action);
   PageActionWithBadgeView* page_action_view =
       GetPageActionView(extension_action);
-  CHECK(page_action_view);
+  if (!page_action_view) {
+    CHECK(GetWebContents());

[Mike Wittman, 2014/12/19 19:13:36]

It would be better to check here that WebContents was not null during the last
call to RefreshPageActionViews. It's entirely possible it could have been null
then but non-null here.

[danduong, 2014/12/19 19:15:08]

I'll probably add both checks.

+    CHECK(!is_popup_mode_);
+    CHECK(!extensions::FeatureSwitch::extension_action_redesign()->IsEnabled());
+    CHECK(false);
+  }
   PageActionImageView* page_action_image_view = page_action_view->image_view();
   CHECK(page_action_image_view);
   ExtensionActionViewController* extension_action_view_controller =