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

components/omnibox/autocomplete_input.h

Index: components/omnibox/autocomplete_input.h
diff --git a/components/omnibox/autocomplete_input.h b/components/omnibox/autocomplete_input.h
index 4d72f07f9d333c3b6d52f7e407f1d0cd54824bcd..fccd7957110e1f285ad05a117cc707209d69ba62 100644
--- a/components/omnibox/autocomplete_input.h
+++ b/components/omnibox/autocomplete_input.h
@@ -194,6 +194,18 @@ class AutocompleteInput {
   // 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();
 
@@ -215,6 +227,8 @@ class AutocompleteInput {
   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_