History: Include search term in queries to history server.

chrome/browser/history/web_history_service.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/history/web_history_service.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/signin/oauth2_token_service.h"
 #include "chrome/browser/signin/oauth2_token_service_factory.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/base/url_util.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 149 matching lines @@
 }
 
 // Converts a time into a string for use as a parameter in a request to the
 // history server.
 std::string ServerTimeString(base::Time time) {
   return base::Int64ToString((time - base::Time::UnixEpoch()).InMicroseconds());
 }
 
 // Returns a URL for querying the history server for a query specified by
 // |options|.
-std::string GetQueryUrl(const QueryOptions& options) {
+std::string GetQueryUrl(const string16& text_query,
+                        const QueryOptions& options) {
   GURL url = GURL(kHistoryQueryHistoryUrl);
   url = net::AppendQueryParameter(url, "titles", "1");
 
   // Take |begin_time|, |end_time|, and |max_count| from the original query
   // options, and convert them to the equivalent URL parameters.
 
   base::Time end_time =
       std::min(base::Time::FromInternalValue(options.EffectiveEndTime()),
                base::Time::Now());
   url = net::AppendQueryParameter(url, "max", ServerTimeString(end_time));
 
   if (!options.begin_time.is_null()) {
     url = net::AppendQueryParameter(
         url, "min", ServerTimeString(options.begin_time));
   }
 
   if (options.max_count) {
     url = net::AppendQueryParameter(
         url, "num", base::IntToString(options.max_count));
   }
 
+  if (!text_query.empty())
+    url = net::AppendQueryParameter(url, "q", UTF16ToUTF8(text_query));
+
   return url.spec();
 }
 
 // Creates a DictionaryValue to hold the parameters for a deletion.
 // Ownership is passed to the caller.
 // |url| may be empty, indicating a time-range deletion.
 DictionaryValue* CreateDeletion(
     const std::string& min_time,
     const std::string& max_time,
     const GURL& url) {
@@ skipping 22 matching lines @@
 }
 
 scoped_ptr<WebHistoryService::Request> WebHistoryService::QueryHistory(
     const string16& text_query,
     const QueryOptions& options,
     const WebHistoryService::QueryWebHistoryCallback& callback) {
   // Wrap the original callback into a generic completion callback.
   RequestImpl::CompletionCallback completion_callback = base::Bind(
       &QueryHistoryCompletionCallback, callback);
 
+  std::string url = GetQueryUrl(text_query, options);
   scoped_ptr<RequestImpl> request(
-      new RequestImpl(profile_, GetQueryUrl(options), completion_callback));
+      new RequestImpl(profile_, url, completion_callback));
   request->Start();
   return request.PassAs<Request>();
 }
 
 scoped_ptr<WebHistoryService::Request> WebHistoryService::ExpireHistory(
     const std::vector<ExpireHistoryArgs>& expire_list,
     const ExpireWebHistoryCallback& callback) {
   DictionaryValue delete_request;
   scoped_ptr<ListValue> deletions(new ListValue);
   base::Time now = base::Time::Now();
@@ skipping 34 matching lines @@
     base::Time end_time,
     const ExpireWebHistoryCallback& callback) {
   std::vector<ExpireHistoryArgs> expire_list(1);
   expire_list.back().urls = restrict_urls;
   expire_list.back().begin_time = begin_time;
   expire_list.back().end_time = end_time;
   return ExpireHistory(expire_list, callback);
 }
 
 }  // namespace history