Remove AutocompleteInput Type and PageClassification.

chrome/browser/android/omnibox/autocomplete_controller_android.cc

 // 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.
 
 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 29 matching lines @@
 #include "jni/AutocompleteController_jni.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
+using metrics::OmniboxEventProto;
 
 namespace {
 
 const int kAndroidAutocompleteProviders =
     AutocompleteClassifier::kDefaultOmniboxProviders;
 
 /**
  * A prefetcher class responsible for triggering zero suggest prefetch.
  * The prefetch occurs as a side-effect of calling StartZeroSuggest() on
  * the AutocompleteController object.
@@ skipping 18 matching lines @@
                                AutocompleteProvider::TYPE_ZERO_SUGGEST)) {
   // Creating an arbitrary fake_request_source to avoid passing in an invalid
   // AutocompleteInput object.
   base::string16 fake_request_source(base::ASCIIToUTF16(
       "http://www.foobarbazblah.com"));
   controller_->StartZeroSuggest(AutocompleteInput(
       fake_request_source,
       base::string16::npos,
       base::string16(),
       GURL(fake_request_source),
-      AutocompleteInput::INVALID_SPEC,
+      OmniboxEventProto::INVALID_SPEC,
       false,
       false,
       true,
       true));
   // Delete ourselves after 10s. This is enough time to cache results or
   // give up if the results haven't been received.
   expire_timer_.Start(FROM_HERE,
                       base::TimeDelta::FromMilliseconds(10000),
                       this, &ZeroSuggestPrefetcher::SelfDestruct);
 }
@@ skipping 32 matching lines @@
   if (!autocomplete_controller_)
     return;
 
   base::string16 desired_tld;
   GURL current_url;
   if (j_current_url != NULL)
     current_url = GURL(ConvertJavaStringToUTF16(env, j_current_url));
   if (j_desired_tld != NULL)
     desired_tld = ConvertJavaStringToUTF16(env, j_desired_tld);
   base::string16 text = ConvertJavaStringToUTF16(env, j_text);
-  AutocompleteInput::PageClassification page_classification =
-      AutocompleteInput::OTHER;
+  OmniboxEventProto::PageClassification page_classification =
+      OmniboxEventProto::OTHER;
   input_ = AutocompleteInput(text,
                              base::string16::npos,
                              desired_tld,
                              current_url,
                              page_classification,
                              prevent_inline_autocomplete,
                              prefer_keyword,
                              allow_exact_keyword_match,
                              want_asynchronous_matches);
   autocomplete_controller_->Start(input_);
@@ skipping 48 matching lines @@
     JNIEnv* env,
     jobject obj,
     jint selected_index,
     jstring j_current_url,
     jboolean is_query_in_omnibox,
     jboolean focused_from_fakebox,
     jlong elapsed_time_since_first_modified,
     jobject j_web_contents) {
   base::string16 url = ConvertJavaStringToUTF16(env, j_current_url);
   const GURL current_url = GURL(url);
-  AutocompleteInput::PageClassification current_page_classification =
+  OmniboxEventProto::PageClassification current_page_classification =
       ClassifyPage(current_url, is_query_in_omnibox, focused_from_fakebox);
   const base::TimeTicks& now(base::TimeTicks::Now());
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(j_web_contents);
 
   OmniboxLog log(
       input_.text(),
       false, /* don't know */
       input_.type(),
       true,
@@ skipping 140 matching lines @@
       ConvertUTF16ToJavaString(env, inline_autocomplete_text);
   jlong j_autocomplete_result =
       reinterpret_cast<intptr_t>(&(autocomplete_result));
   Java_AutocompleteController_onSuggestionsReceived(env,
                                                     java_bridge.obj(),
                                                     suggestion_list_obj.obj(),
                                                     inline_text.obj(),
                                                     j_autocomplete_result);
 }
 
-AutocompleteInput::PageClassification
+OmniboxEventProto::PageClassification
 AutocompleteControllerAndroid::ClassifyPage(const GURL& gurl,
                                             bool is_query_in_omnibox,
                                             bool focused_from_fakebox) const {
   if (!gurl.is_valid())
-    return AutocompleteInput::INVALID_SPEC;
+    return OmniboxEventProto::INVALID_SPEC;
 
   const std::string& url = gurl.spec();
 
   if (gurl.SchemeIs(content::kChromeUIScheme) &&
       gurl.host() == chrome::kChromeUINewTabHost) {
-    return AutocompleteInput::NTP;
+    return OmniboxEventProto::NTP;
   }
 
   if (url == chrome::kChromeUINativeNewTabURL) {
     return focused_from_fakebox ?
-        AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS :
-        AutocompleteInput::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS;
+        OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS :
+        OmniboxEventProto::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS;
   }
 
   if (url == url::kAboutBlankURL)
-    return AutocompleteInput::BLANK;
+    return OmniboxEventProto::BLANK;
 
   if (url == profile_->GetPrefs()->GetString(prefs::kHomePage))
-    return AutocompleteInput::HOME_PAGE;
+    return OmniboxEventProto::HOME_PAGE;
 
   if (is_query_in_omnibox)
-    return AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
+    return OmniboxEventProto::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
 
   bool is_search_url = TemplateURLServiceFactory::GetForProfile(profile_)->
       IsSearchResultsPageFromDefaultSearchProvider(gurl);
   if (is_search_url)
-    return AutocompleteInput::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
+    return OmniboxEventProto::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
 
-  return AutocompleteInput::OTHER;
+  return OmniboxEventProto::OTHER;
 }
 
 ScopedJavaLocalRef<jobject>
 AutocompleteControllerAndroid::BuildOmniboxSuggestion(
     JNIEnv* env,
     const AutocompleteMatch& match) {
   ScopedJavaLocalRef<jstring> contents =
       ConvertUTF16ToJavaString(env, match.contents);
   ScopedJavaLocalRef<jstring> description =
       ConvertUTF16ToJavaString(env, match.description);
@@ skipping 78 matching lines @@
     JNIEnv* env, jclass clazz, jstring jquery) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   if (!profile)
     return NULL;
   AutocompleteMatch match;
   base::string16 query_string(ConvertJavaStringToUTF16(env, jquery));
   AutocompleteClassifierFactory::GetForProfile(profile)->Classify(
       query_string,
       false,
       false,
-      AutocompleteInput::INVALID_SPEC,
+      OmniboxEventProto::INVALID_SPEC,
       &match,
       NULL);
   if (!match.destination_url.is_valid())
     return NULL;
 
   // Only return a URL if the match is a URL type.
   if (match.type != AutocompleteMatchType::URL_WHAT_YOU_TYPED &&
       match.type != AutocompleteMatchType::HISTORY_URL &&
       match.type != AutocompleteMatchType::NAVSUGGEST)
     return NULL;
@@ skipping 11 matching lines @@
     return;
 
   // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
   new ZeroSuggestPrefetcher(profile);
 }
 
 // Register native methods
 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }