Omnibox: HistoryContents Shouldn't *Always* Clear Results on Stop()

chrome/browser/autocomplete/history_contents_provider.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/autocomplete/history_contents_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 134 matching lines @@
                      base::Unretained(this)));
     }
   }
 }
 
 void HistoryContentsProvider::Stop(bool clear_cached_results) {
   done_ = true;
   request_consumer_.CancelAllRequests();
 
   // Clear the results. We swap in an empty one as the easy way to clear it.
-  history::QueryResults empty_results;
-  results_.Swap(&empty_results);
-  have_results_ = false;
+  if (clear_cached_results) {
+    history::QueryResults empty_results;
+    results_.Swap(&empty_results);
+    have_results_ = false;
+  }
 }
 
 HistoryContentsProvider::~HistoryContentsProvider() {
 }
 
 void HistoryContentsProvider::QueryComplete(HistoryService::Handle handle,
                                             history::QueryResults* results) {
   DCHECK(results_.empty());
   results_.Swap(results);
   have_results_ = true;
@@ skipping 97 matching lines @@
 
 int HistoryContentsProvider::CalculateRelevance(
     const history::URLResult& result) {
   const bool in_title = MatchInTitle(result);
   BookmarkModel* bm_model = BookmarkModelFactory::GetForProfile(profile_);
   if (!bm_model || !bm_model->IsBookmarked(result.url()))
     return in_title ? (700 + title_count_++) : (500 + contents_count_++);
   return in_title ?
       (1000 + star_title_count_++) : (550 + star_contents_count_++);
 }