2 files changed, 10 insertions, 13 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index 4d8f585..42f1051 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -1254,27 +1254,25 @@ bool OmniboxEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   }
 }
 
-metrics::OmniboxEventProto::PageClassification
-    OmniboxEditModel::ClassifyPage() const {
+AutocompleteInput::PageClassification OmniboxEditModel::ClassifyPage() const {
   if (!delegate_->CurrentPageExists())
-    return metrics::OmniboxEventProto::OTHER;
+    return AutocompleteInput::OTHER;
   if (delegate_->IsInstantNTP())
-    return metrics::OmniboxEventProto::INSTANT_NEW_TAB_PAGE;
+    return AutocompleteInput::INSTANT_NEW_TAB_PAGE;
   const GURL& gurl = delegate_->GetURL();
   if (!gurl.is_valid())
-    return metrics::OmniboxEventProto::INVALID_SPEC;
+    return AutocompleteInput::INVALID_SPEC;
   const std::string& url = gurl.spec();
   if (url == chrome::kChromeUINewTabURL)
-    return metrics::OmniboxEventProto::NEW_TAB_PAGE;
+    return AutocompleteInput::NEW_TAB_PAGE;
   if (url == content::kAboutBlankURL)
-    return metrics::OmniboxEventProto::BLANK;
+    return AutocompleteInput::BLANK;
   if (url == profile()->GetPrefs()->GetString(prefs::kHomePage))
-    return metrics::OmniboxEventProto::HOMEPAGE;
+    return AutocompleteInput::HOMEPAGE;
   if (view_->toolbar_model()->WouldReplaceSearchURLWithSearchTerms(true)) {
-    return metrics::
-        OmniboxEventProto::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
+    return AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
   }
-  return metrics::OmniboxEventProto::OTHER;
+  return AutocompleteInput::OTHER;
 }
 
 void OmniboxEditModel::ClassifyStringForPasteAndGo(
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index 4087b4d..d349892 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -13,7 +13,6 @@
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/ui/omnibox/omnibox_controller.h"
-#include "chrome/common/metrics/proto/omnibox_event.pb.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "content/public/common/page_transition_types.h"
 #include "ui/base/window_open_disposition.h"
@@ -387,7 +386,7 @@ class OmniboxEditModel {
   // page or a normal web page.  Used for logging omnibox events for
   // UMA opted-in users.  Examines the user's profile to determine if the
   // current page is the user's home page.
-  metrics::OmniboxEventProto::PageClassification ClassifyPage() const;
+  AutocompleteInput::PageClassification ClassifyPage() const;
 
   // Sets |match| and |alternate_nav_url| based on classifying |text|.
   // |alternate_nav_url| may be NULL.