Omnibox: Fix URL-What-You-Typed Allowed-To-Be-Default-Match Issues

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/json/json_writer.h"
@@ skipping 317 matching lines @@
       }
     }
   } else {
     // Otherwise, match_contents_ is a verbatim (what-you-typed) match, either
     // for the default provider or a keyword search provider.
     match_contents_class_.push_back(
         ACMatchClassification(0, ACMatchClassification::NONE));
   }
 }
 
-bool BaseSearchProvider::SuggestResult::IsInlineable(
-    const base::string16& input) const {
-  return StartsWith(suggestion_, input, false);
-}
-
 int BaseSearchProvider::SuggestResult::CalculateRelevance(
     const AutocompleteInput& input,
     bool keyword_provider_requested) const {
   if (!from_keyword_provider_ && keyword_provider_requested)
     return 100;
   return ((input.type() == metrics::OmniboxInputType::URL) ? 300 : 600);
 }
 
 // BaseSearchProvider::NavigationResult ----------------------------------------
 
@@ skipping 54 matching lines @@
   if (allow_bolding_nothing || (match_start != base::string16::npos)) {
     match_contents_ = match_contents;
     // Safe if |match_start| is npos; also safe if the input is longer than the
     // remaining contents after |match_start|.
     AutocompleteMatch::ClassifyLocationInString(match_start,
         input_text.length(), match_contents_.length(),
         ACMatchClassification::URL, &match_contents_class_);
   }
 }
 
-bool BaseSearchProvider::NavigationResult::IsInlineable(
-    const base::string16& input) const {
-  return
-      URLPrefix::BestURLPrefix(base::UTF8ToUTF16(url_.spec()), input) != NULL;

[Peter Kasting, 2014/06/30 23:02:58]

Can we remove any #includes due to deleting this code (or the code above)?

[Mark P, 2014/06/30 23:27:36]

I just checked.  The answer is no.

-}
-
 int BaseSearchProvider::NavigationResult::CalculateRelevance(
     const AutocompleteInput& input,
     bool keyword_provider_requested) const {
   return (from_keyword_provider_ || !keyword_provider_requested) ? 800 : 150;
 }
 
 // BaseSearchProvider::Results -------------------------------------------------
 
 BaseSearchProvider::Results::Results() : verbatim_relevance(-1) {}
 
@@ skipping 574 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);
 }