Handle Search suggest subtypes for Shortcuts DB

chrome/browser/autocomplete/base_search_provider.cc

 // Copyright 2014 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/base_search_provider.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/prefs/pref_service.h"
@@ skipping 105 matching lines @@
       field_trial_triggered_(false),
       field_trial_triggered_in_session_(false),
       suggest_results_pending_(0) {
 }
 
 // static
 bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) {
   return match.GetAdditionalInfo(kShouldPrefetchKey) == kTrue;
 }
 
+// static
+AutocompleteMatch BaseSearchProvider::CreateSearchSuggestion(
+    const base::string16& suggestion,
+    AutocompleteMatchType::Type type,
+    const base::string16& match_contents,

[Peter Kasting, 2014/03/24 21:53:07]

You don't seem to use this arg?

[Anuj, 2014/03/25 06:32:05]

Done.

+    bool from_keyword_provider,
+    const TemplateURL* template_url) {
+  return CreateSearchSuggestion(
+      NULL,
+      AutocompleteInput(),
+      BaseSearchProvider::SuggestResult(
+          suggestion,
+          type,
+          suggestion,
+          base::string16(), // Omit match_contents_prefix.
+          base::string16(),
+          std::string(), // Omit suggest_query_params.
+          std::string(), // Omit deletion_url.
+          from_keyword_provider,
+          0, // Ignore relevance.
+          false, // Ignore relevance_from_server.
+          false, // Ignore should_prefetch.
+          base::string16()), // Omit input_test.
+      template_url,
+      0, // accepted_suggestion
+      0, // omnibox_start_margin,
+      false);

[Peter Kasting, 2014/03/24 21:53:07]

Nit: Let's go ahead and omit the EOL comments and just do this like:

  return CreateSearchSuggestion(
      NULL, AutocompleteInput(), BaseSearchProvider::SuggestResult(
          suggestion, type, suggestion, base::string16(), base::string16(),
          std::string(), std::string(), from_keyword_provider, 0, false, false,
          base::string16()),
      template_url, 0, 0, false);

...just because this is so long otherwise, and almost all the args are really
"don't care" values rather than things where it's important what they mean.

[Anuj, 2014/03/25 06:32:05]

Done.

+}
+
 void BaseSearchProvider::Stop(bool clear_cached_results) {
   StopSuggest();
   done_ = true;
 
   if (clear_cached_results)
     ClearAllResults();
 }
 
 void BaseSearchProvider::DeleteMatch(const AutocompleteMatch& match) {
   DCHECK(match.deletable);
@@ skipping 736 matching lines @@
 }
 
 void BaseSearchProvider::OnDeletionComplete(
     bool success, SuggestionDeletionHandler* handler) {
   RecordDeletionResult(success);
   SuggestionDeletionHandlers::iterator it = std::find(
       deletion_handlers_.begin(), deletion_handlers_.end(), handler);
   DCHECK(it != deletion_handlers_.end());
   deletion_handlers_.erase(it);
 }