Add more checks to ShowPageActionPopup

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 1297 matching lines @@
 
 bool LocationBarView::ShowPageActionPopup(
     const extensions::Extension* extension,
     bool grant_tab_permissions) {
   ExtensionAction* extension_action =
       extensions::ExtensionActionManager::Get(profile())->GetPageAction(
           *extension);
   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 =
       page_action_image_view->view_controller();
   CHECK(extension_action_view_controller);
   return extension_action_view_controller->ExecuteAction(grant_tab_permissions);
 }
 
 void LocationBarView::UpdateOpenPDFInReaderPrompt() {
   open_pdf_in_reader_view_->Update(
@@ skipping 336 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }