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

components/omnibox/autocomplete_result.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_RESULT_H_
 #define COMPONENTS_OMNIBOX_AUTOCOMPLETE_RESULT_H_
 
 #include <stddef.h>
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "url/gurl.h"
 
 class AutocompleteInput;
 class AutocompleteProvider;
+class AutocompleteProviderClient;
 class TemplateURLService;
 
 // All matches from all providers for a particular query.  This also tracks
 // what the default match should be if the user doesn't manually select another
 // match.
 class AutocompleteResult {
  public:
   typedef ACMatches::const_iterator const_iterator;
   typedef ACMatches::iterator iterator;
 
@@ skipping 24 matching lines @@
     // True when this is the HistoryURLProvider's "what you typed" match.  This
     // can't be tracked using |destination_url| because its URL changes on every
     // keystroke, so if this is set, we'll preserve the selection by simply
     // choosing the new "what you typed" entry and ignoring |destination_url|.
     bool is_history_what_you_typed_match;
   };
 
   // Max number of matches we'll show from the various providers.
   static const size_t kMaxMatches;
 
-  AutocompleteResult();
+  AutocompleteResult(AutocompleteProviderClient* client);

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

Nit: explicit

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

Now moot.

   ~AutocompleteResult();
 
   // Copies matches from |old_matches| to provide a consistant result set. See
   // comments in code for specifics.
   void CopyOldMatches(const AutocompleteInput& input,
                       const AutocompleteResult& old_matches,
                       TemplateURLService* template_url_service);
 
   // Adds a new set of matches to the result set.  Does not re-sort.  Calls
   // PossiblySwapContentsAndDescriptionForURLSuggestion(input)" on all added
@@ skipping 96 matching lines @@
 
   // The "alternate navigation URL", if any, for this result set.  This is a URL
   // to try offering as a navigational option in case the user navigated to the
   // URL of the default match but intended something else.  For example, if the
   // user's local intranet contains site "foo", and the user types "foo", we
   // default to searching for "foo" when the user may have meant to navigate
   // there.  In cases like this, the default match will point to the "search for
   // 'foo'" result, and this will contain "http://foo/".
   GURL alternate_nav_url_;
 
+  AutocompleteProviderClient* client_;
+
   DISALLOW_COPY_AND_ASSIGN(AutocompleteResult);
 };
 
 #endif  // COMPONENTS_OMNIBOX_AUTOCOMPLETE_RESULT_H_