Fix 8030: Crash in EndFindSession (automation_ui_test)

chrome/browser/views/find_bar_win.cc

 // Copyright (c) 2006-2008 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/views/find_bar_win.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/view_ids.h"
@@ skipping 178 matching lines @@
 }
 
 bool FindBarWin::IsAnimating() {
   return animation_->IsAnimating();
 }
 
 void FindBarWin::EndFindSession() {
   animation_->Reset(1.0);
   animation_->Hide();
 
-  // When we hide the window, we need to notify the renderer that we are done
-  // for now, so that we can abort the scoping effort and clear all the
-  // tickmarks and highlighting.
-  web_contents_->StopFinding(false);  // false = don't clear selection on
-                                      // page.
-  view_->UpdateForResult(web_contents_->find_result(), std::wstring());
+  // |web_contents_| can be NULL for a number of reasons, for example when the
+  // tab is closing. We must guard against that case. See issue 8030.
+  if (web_contents_) {
+    // When we hide the window, we need to notify the renderer that we are done
+    // for now, so that we can abort the scoping effort and clear all the
+    // tickmarks and highlighting.
+    web_contents_->StopFinding(false);  // false = don't clear selection on
+                                        // page.
+    view_->UpdateForResult(web_contents_->find_result(), std::wstring());
 
-  // When we get dismissed we restore the focus to where it belongs.
-  RestoreSavedFocus();
+    // When we get dismissed we restore the focus to where it belongs.
+    RestoreSavedFocus();
+  }
 }
 
 void FindBarWin::ChangeWebContents(WebContents* contents) {
   if (web_contents_) {
     NotificationService::current()->RemoveObserver(
         this, NotificationType::FIND_RESULT_AVAILABLE,
         Source<TabContents>(web_contents_));
     NotificationService::current()->RemoveObserver(
         this, NotificationType::NAV_ENTRY_COMMITTED,
         Source<NavigationController>(web_contents_->controller()));
@@ skipping 55 matching lines @@
   view_->SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarWin, NotificationObserver implementation:
 
 void FindBarWin::Observe(NotificationType type,
                          const NotificationSource& source,
                          const NotificationDetails& details) {
   if (type == NotificationType::FIND_RESULT_AVAILABLE) {
-    // Don't update for notifications from TabContentses other than the one we are
-    // actively tracking.
+    // Don't update for notifications from TabContentses other than the one we
+    // are actively tracking.
     if (Source<TabContents>(source).ptr() == web_contents_) {
       UpdateUIForFindResult(web_contents_->find_result(),
                             web_contents_->find_text());
       FindNotificationDetails details = web_contents_->find_result();
     }
   } else if (type == NotificationType::NAV_ENTRY_COMMITTED) {
     NavigationController* source_controller =
         Source<NavigationController>(source).ptr();
     if (source_controller == web_contents_->controller()) {
       NavigationController::LoadCommittedDetails* commit_details =
@@ skipping 256 matching lines @@
 
   // We now need to check if the window is obscuring the search results.
   if (!result.selection_rect().IsEmpty())
     MoveWindowIfNecessary(result.selection_rect(), false);
 
   // Once we find a match we no longer want to keep track of what had
   // focus. EndFindSession will then set the focus to the page content.
   if (result.number_of_matches() > 0)
     focus_tracker_.reset(NULL);
 }