Allow the history URL provider to handle input of type QUERY. This helps in ...

chrome/browser/autocomplete/keyword_provider.cc

 // Copyright (c) 2009 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/keyword_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 216 matching lines @@
       // See comments on an identical NOTREACHED() in search_provider.cc.
       NOTREACHED();
     }
   }
 }
 
 // static
 int KeywordProvider::CalculateRelevance(AutocompleteInput::Type type,
                                         bool complete,
                                         bool no_query_text_needed) {
-  if (complete && no_query_text_needed)
+  if (!complete)
+    return (type == AutocompleteInput::URL) ? 700 : 450;
+  if (no_query_text_needed)
     return 1500;
-
-  switch (type) {
-    case AutocompleteInput::UNKNOWN:
-    case AutocompleteInput::REQUESTED_URL:
-      return complete ? 1100 : 450;
-
-    case AutocompleteInput::URL:
-      return complete ? 1100 : 700;
-
-    case AutocompleteInput::QUERY:
-      return complete ? 1400 : 650;
-
-    default:
-      NOTREACHED();
-      return 0;
-  }
+  return (type == AutocompleteInput::QUERY) ? 1450 : 1100;
 }
 
 AutocompleteMatch KeywordProvider::CreateAutocompleteMatch(
     TemplateURLModel* model,
     const std::wstring keyword,
     const AutocompleteInput& input,
     size_t prefix_length,
     const std::wstring& remaining_input) {
   DCHECK(model);
   // Get keyword data from data store.
@@ skipping 35 matching lines @@
   AutocompleteMatch::ClassifyLocationInString(kKeywordDesc.find(L"%s"),
                                               prefix_length,
                                               result.description.length(),
                                               ACMatchClassification::DIM,
                                               &result.description_class);
 
   result.transition = PageTransition::KEYWORD;
 
   return result;
 }