Omnibox - Do Not Allow HTTP/HTTPS Equivalence if User Explicitly Entered A Scheme

components/omnibox/autocomplete_input.h

 // 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.
 
 #ifndef COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_
 #define COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 176 matching lines @@
   bool allow_exact_keyword_match() const { return allow_exact_keyword_match_; }
 
   // Returns whether providers should be allowed to make asynchronous requests
   // when processing this input.
   bool want_asynchronous_matches() const { return want_asynchronous_matches_; }
 
   // Returns whether this input query was triggered due to the omnibox being
   // focused.
   bool from_omnibox_focus() const { return from_omnibox_focus_; }
 
+  // Returns the terms in |text_| that start with http:// or https:// plus
+  // at least one more character, stored without the scheme.  Stored in both
+  // UTF-8 and UTF-16 because both formats are necessary and we don't want
+  // to repeatedly do conversions later.  Used in duplicate elimination to
+  // detect whether, for a given URL, the user may have started typing that
+  // URL with an explicit scheme; see comments on
+  // AutocompleteMatch::GURLToStrippedGURL().
+  const std::vector<std::pair<std::string, base::string16> >&

[Peter Kasting, 2015/06/29 05:04:59]

Nit: No space between > >.  (Yay C++11 language support)  (Multiple places in
multiple files)

However, it may make sense to define a typedef for the pair type, the vector
type, or both, rather than repeat the types in a few different places.

[Mark P, 2015/06/30 04:23:17]

Now that it's back to a vector, I think a typedef is basically unnecessary.

+      terms_prefixed_by_http_or_https() const {
+    return terms_prefixed_by_http_or_https_;
+  }
+
   // Resets all internal variables to the null-constructed state.
   void Clear();
 
  private:
   friend class AutocompleteProviderTest;
 
   // NOTE: Whenever adding a new field here, please make sure to update Clear()
   // method.
   base::string16 text_;
   size_t cursor_position_;
   GURL current_url_;
   metrics::OmniboxEventProto::PageClassification current_page_classification_;
   metrics::OmniboxInputType::Type type_;
   url::Parsed parts_;
   base::string16 scheme_;
   GURL canonicalized_url_;
   bool prevent_inline_autocomplete_;
   bool prefer_keyword_;
   bool allow_exact_keyword_match_;
   bool want_asynchronous_matches_;
   bool from_omnibox_focus_;
+  std::vector<std::pair<std::string, base::string16> >
+      terms_prefixed_by_http_or_https_;
 };
 
 #endif  // COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_