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

chrome/browser/autocomplete/autocomplete_result.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/autocomplete/autocomplete_result.h"
 
 #include <algorithm>
 #include <iterator>
 
+#include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/autocomplete_match_type.h"
 #include "components/autocomplete/autocomplete_input.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
@@ skipping 237 matching lines @@
     // sure the type of destination is what the user would expect given the
     // input.
     if (default_match_->destination_url.is_valid()) {
       // We shouldn't get query matches for URL inputs, or non-query matches
       // for query inputs.
       if (AutocompleteMatch::IsSearchType(default_match_->type)) {
         DCHECK_NE(metrics::OmniboxInputType::URL, input.type()) << debug_info;
       } else {
         DCHECK_NE(metrics::OmniboxInputType::FORCED_QUERY, input.type())
             << debug_info;
+        // If the user explicitly typed a scheme, the default match should
+        // have the same scheme.
+        if ((input.type() == metrics::OmniboxInputType::URL) &&
+            input.parts().scheme.is_nonempty()) {
+          DCHECK_EQ(base::UTF16ToUTF8(base::i18n::ToLower(input.scheme())),

[Peter Kasting, 2014/07/09 22:36:00]

This isn't already lowercased for us?

[Mark P, 2014/07/09 23:12:23]

Right you are.  Done.

+                    default_match_->destination_url.scheme());
+        }
       }
     }
   }
 
   // Set the alternate nav URL.
   alternate_nav_url_ = (default_match_ == matches_.end()) ?
       GURL() : ComputeAlternateNavUrl(input, *default_match_);
 }
 
 bool AutocompleteResult::HasCopiedMatches() const {
@@ skipping 170 matching lines @@
        i != old_matches.rend() && delta > 0; ++i) {
     if (!HasMatchByDestination(*i, new_matches)) {
       AutocompleteMatch match = *i;
       match.relevance = std::min(max_relevance, match.relevance);
       match.from_previous = true;
       matches_.push_back(match);
       delta--;
     }
   }
 }