Merge r17891....

chrome/browser/autocomplete/autocomplete.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.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 685 matching lines @@
   for (ACProviders::const_iterator i(providers_.begin());
        i != providers_.end(); ++i) {
     if (!(*i)->done())
       (*i)->Stop();
   }
 
   done_ = true;
   update_pending_ = false;
   if (clear_result)
     result_.Reset();
-  latest_result_.CopyFrom(result_);  // Not strictly necessary, but keeps
-                                     // internal state consistent.
+  latest_result_.CopyFrom(result_);
   coalesce_timer_.Stop();
   max_delay_timer_.Stop();
 }
 
 void AutocompleteController::DeleteMatch(const AutocompleteMatch& match) {
   DCHECK(match.deletable);
   match.provider->DeleteMatch(match);  // This will synchronously call back to
                                        // OnProviderUpdate().
 
   // Notify observers of this change immediately, so the UI feels responsive to
@@ skipping 178 matching lines @@
     match.contents_class.push_back(
         ACMatchClassification(keyword_offset + input_.text().size(),
                               ACMatchClassification::NONE));
   }
   match.destination_url =
       HistoryUI::GetHistoryURLWithSearchText(input_.text());
   match.transition = PageTransition::AUTO_BOOKMARK;
   match.provider = history_contents_provider_;
   latest_result_.AddMatch(match);
 }