History: Include search term in queries to history server.

chrome/browser/ui/webui/history_ui.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/webui/history_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 803 matching lines @@
 void BrowsingHistoryHandler::ReturnResultsToFrontEnd() {
   Profile* profile = Profile::FromWebUI(web_ui());
   BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile);
   ManagedUserService* managed_user_service = NULL;
 #if defined(ENABLE_MANAGED_USERS)
   managed_user_service = ManagedUserServiceFactory::GetForProfile(profile);
 #endif
 
   // Combine the local and remote results into |query_results_|, and remove
   // any duplicates.
-  if (query_results_.size() && web_history_query_results_.size()) {
-    // Each result set covers a particular time range. Determine the
-    // intersection of the two time ranges, discard any entries from either
-    // set the are older than that, and then combine the results.
-    base::Time cutoff_time = std::max(query_results_.back().time,
-                                      web_history_query_results_.back().time);
-    RemoveOlderEntries(&query_results_, cutoff_time);
-    RemoveOlderEntries(&web_history_query_results_, cutoff_time);
-
-    int local_result_count = query_results_.size();
+  if (web_history_query_results_.size()) {

[Dan Beam, 2013/03/25 21:09:19]

size() -> !empty()

[Patrick Dubroy, 2013/03/25 21:18:49]

Done.

+    if (query_results_.size()) {
+      // Each result set covers a particular time range. Determine the
+      // intersection of the two time ranges, discard any entries from either
+      // set that are older than that, and then combine the results.
+      base::Time cutoff_time = std::max(
+          query_results_.back().time,
+          web_history_query_results_.back().time);
+      RemoveOlderEntries(&query_results_, cutoff_time);
+      RemoveOlderEntries(&web_history_query_results_, cutoff_time);
+    }
     query_results_.insert(query_results_.end(),
                           web_history_query_results_.begin(),
                           web_history_query_results_.end());
-    RemoveDuplicateResults(&query_results_);
 
-    // In the best case, we expect that all local results are duplicated on the
-    // server. Keep track of how many are missing.
-    if (local_result_count) {
+    if (query_results_.size()) {

[Dan Beam, 2013/03/25 21:09:19]

^ wont this always be non-empty now?

[Patrick Dubroy, 2013/03/25 21:18:49]

Nope, RemoveOlderEntries might actually make it empty.

[Dan Beam, 2013/03/25 21:27:02]

but there's a "querty_results_.insert()" call right above this

[Patrick Dubroy, 2013/03/25 21:31:56]

Yeah, you're right. Fixed.

+      RemoveDuplicateResults(&query_results_);
+
+      // In the best case, we expect that all local results are duplicated on
+      // the server. Keep track of how many are missing.
       int missing_count = std::count_if(
           query_results_.begin(), query_results_.end(), IsLocalOnlyResult);
       UMA_HISTOGRAM_PERCENTAGE("WebHistory.LocalResultMissingOnServer",
-                               missing_count * 100.0 / local_result_count);
+                               missing_count * 100.0 / query_results_.size());
     }
   }
 
   // Convert the result vector into a ListValue.
   ListValue results_value;
   for (std::vector<BrowsingHistoryHandler::HistoryEntry>::iterator it =
            query_results_.begin(); it != query_results_.end(); ++it) {
     scoped_ptr<base::Value> value(
         it->ToValue(bookmark_model, managed_user_service));
     results_value.Append(value.release());
@@ skipping 253 matching lines @@
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }