Remove AutocompleteInput Type and PageClassification.

chrome/browser/autocomplete/autocomplete_result.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_H_
 
 #include <stddef.h>
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
 #include "url/gurl.h"
 
 class AutocompleteInput;

[Mark P, 2014/06/20 00:08:29]

This isn't necessary if we're including autocomplete_input directly.

[Jun Mukai, 2014/06/20 00:29:51]

Done.

 class AutocompleteProvider;
 class Profile;
 
 // 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 115 matching lines @@
   // |alternate_nav_url_|.
   static GURL ComputeAlternateNavUrl(const AutocompleteInput& input,
                                      const AutocompleteMatch& match);
 
   // Sort |matches| by destination, taking into account demotions based on
   // |page_classification| when resolving ties about which of several
   // duplicates to keep.  The matches are also deduplicated.  If
   // |set_duplicate_matches| is true, the duplicate matches are stored in the
   // |duplicate_matches| vector of the corresponding AutocompleteMatch.
   static void DedupMatchesByDestination(
-      AutocompleteInput::PageClassification page_classification,
+      metrics::OmniboxEventProto::PageClassification page_classification,
       bool set_duplicate_matches,
       ACMatches* matches);
 
  private:
   friend class AutocompleteProviderTest;
 
   typedef std::map<AutocompleteProvider*, ACMatches> ProviderToMatches;
 
 #if defined(OS_ANDROID)
   // iterator::difference_type is not defined in the STL that we compile with on
@@ skipping 10 matching lines @@
 
   // operator=() by another name.
   void CopyFrom(const AutocompleteResult& rhs);
 
   // Populates |provider_to_matches| from |matches_|.
   void BuildProviderToMatches(ProviderToMatches* provider_to_matches) const;
 
   // Copies matches into this result. |old_matches| gives the matches from the
   // last result, and |new_matches| the results from this result.
   void MergeMatchesByProvider(
-      AutocompleteInput::PageClassification page_classification,
+      metrics::OmniboxEventProto::PageClassification page_classification,
       const ACMatches& old_matches,
       const ACMatches& new_matches);
 
   ACMatches matches_;
 
   const_iterator default_match_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteResult);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_H_