Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro…

components/omnibox/browser/autocomplete_result.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 "components/omnibox/browser/autocomplete_result.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/command_line.h"
@@ skipping 235 matching lines @@
             ? base::ASCIIToUTF16(default_match_->provider->GetName())
             : base::string16()) +
         base::ASCIIToUTF16(", input=") +
         input.text();
     DCHECK(default_match_->allowed_to_be_default_match) << debug_info;
     // If the default match is valid (i.e., not a prompt/placeholder), make
     // 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.

[Peter Kasting, 2016/04/13 02:52:16]

Nit: Move this comment into the first conditional arm, and remove the comma and
everything following.

[Tom (Use chromium acct), 2016/04/13 23:37:40]

Done.

       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()) {
           const std::string& in_scheme = base::UTF16ToUTF8(input.scheme());
           const std::string& dest_scheme =
               default_match_->destination_url.scheme();
           DCHECK(url_formatter::IsEquivalentScheme(in_scheme, dest_scheme))
               << debug_info;
         }
@@ skipping 192 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--;
     }
   }
 }