Fix crash due to AutocompletePopup trying to draw the old results when they w...

chrome/browser/autocomplete/autocomplete_popup_model.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/autocomplete/autocomplete_popup_model.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/net/dns_global.h"
@@ skipping 232 matching lines @@
 
 void AutocompletePopupModel::Move(int count) {
   // TODO(pkasting): Temporary hack.  If the query is running while the popup is
   // open, we might be showing the results of the previous query still.  Force
   // the popup to display the latest results so the popup and the controller
   // aren't out of sync.  The better fix here is to roll the controller back to
   // be in sync with what the popup is showing.
   if (IsOpen() && !controller_->done()) {
     Observe(NotificationType::AUTOCOMPLETE_CONTROLLER_RESULT_UPDATED,
             Source<AutocompleteController>(controller_.get()),
-            NotificationService::NoDetails());
+            Details<const AutocompleteResult>(&controller_->result()));
   }
 
   const AutocompleteResult& result = controller_->result();
   if (result.empty())
     return;
 
   // The user is using the keyboard to change the selection, so stop tracking
   // hover.
   SetHoveredLine(kNoMatch);
 
@@ skipping 25 matching lines @@
     }
   }
 }
 
 void AutocompletePopupModel::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (inside_synchronous_query_)
     return;
 
-  const AutocompleteResult& result = controller_->result();
+  const AutocompleteResult* result =
+      Details<const AutocompleteResult>(details).ptr();
   switch (type.value) {
     case NotificationType::AUTOCOMPLETE_CONTROLLER_RESULT_UPDATED: {
-      selected_line_ = (result.default_match() == result.end()) ?
-          kNoMatch : (result.default_match() - result.begin());
+      selected_line_ = (result->default_match() == result->end()) ?
+          kNoMatch : (result->default_match() - result->begin());
       // If we're going to trim the window size to no longer include the hovered
       // line, turn hover off.  Practically, this shouldn't happen, but it
       // doesn't hurt to be defensive.
-      if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_))
+      if ((hovered_line_ != kNoMatch) && (result->size() <= hovered_line_))
         SetHoveredLine(kNoMatch);
 
       view_->UpdatePopupAppearance();
     }
     // FALL THROUGH
 
     case NotificationType::
              AUTOCOMPLETE_CONTROLLER_SYNCHRONOUS_MATCHES_AVAILABLE: {
       // Update the edit with the possibly new data for this match.
       // NOTE: This must be done after the code above, so that our internal
       // state will be consistent when the edit calls back to
       // URLsForCurrentSelection().
       std::wstring inline_autocomplete_text;
       std::wstring keyword;
       bool is_keyword_hint = false;
       AutocompleteMatch::Type type = AutocompleteMatch::SEARCH_WHAT_YOU_TYPED;
-      const AutocompleteResult::const_iterator match(result.default_match());
-      if (match != result.end()) {
+      const AutocompleteResult::const_iterator match(result->default_match());
+      if (match != result->end()) {
         if ((match->inline_autocomplete_offset != std::wstring::npos) &&
             (match->inline_autocomplete_offset <
                 match->fill_into_edit.length())) {
           inline_autocomplete_text =
               match->fill_into_edit.substr(match->inline_autocomplete_offset);
         }
         // Warm up DNS Prefetch Cache.
         chrome_browser_net::DnsPrefetchUrl(match->destination_url);
         // We could prefetch the alternate nav URL, if any, but because there
         // can be many of these as a user types an initial series of characters,
         // the OS DNS cache could suffer eviction problems for minimal gain.
 
         is_keyword_hint = GetKeywordForMatch(*match, &keyword);
         type = match->type;
       }
       edit_model_->OnPopupDataChanged(inline_autocomplete_text, false, keyword,
           is_keyword_hint, type);
       return;
     }
 
     default:
       NOTREACHED();
   }
 }