Extending the UserClassifier to actually support classification.

chrome/browser/android/ntp/ntp_snippets_bridge.cc

 // Copyright 2016 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/ntp/ntp_snippets_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/callback_android.h"
 #include "base/android/jni_android.h"
@@ skipping 250 matching lines @@
   JavaIntArrayToIntVector(env, jsuggestions_per_category,
                           &suggestions_per_category_int);
   DCHECK_EQ(categories_int.size(), suggestions_per_category_int.size());
   std::vector<std::pair<Category, int>> suggestions_per_category;
   for (size_t i = 0; i < categories_int.size(); i++) {
     suggestions_per_category.push_back(
         std::make_pair(CategoryFromIDValue(categories_int[i]),
                        suggestions_per_category_int[i]));
   }
   ntp_snippets::metrics::OnPageShown(suggestions_per_category);
-  content_suggestions_service_->user_classifier()->OnNTPOpened();
+  content_suggestions_service_->user_classifier()->OnEvent(
+      ntp_snippets::UserClassifier::Metric::NTP_OPENED);
 }
 
 void NTPSnippetsBridge::OnSuggestionShown(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj,
                                           jint global_position,
                                           jint category,
                                           jint category_position,
                                           jlong publish_timestamp_ms,
                                           jfloat score) {
   ntp_snippets::metrics::OnSuggestionShown(
       global_position, CategoryFromIDValue(category), category_position,
       TimeFromJavaTime(publish_timestamp_ms), score);
-  if (global_position == 0)
-    content_suggestions_service_->user_classifier()->OnSuggestionsShown();
+  if (global_position == 0) {
+    content_suggestions_service_->user_classifier()->OnEvent(
+        ntp_snippets::UserClassifier::Metric::SUGGESTIONS_SHOWN);
+  }
 }
 
 void NTPSnippetsBridge::OnSuggestionOpened(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj,
                                            jint global_position,
                                            jint category,
                                            jint category_position,
                                            jlong publish_timestamp_ms,
                                            jfloat score,
                                            int windowOpenDisposition) {
   ntp_snippets::metrics::OnSuggestionOpened(
       global_position, CategoryFromIDValue(category), category_position,
       TimeFromJavaTime(publish_timestamp_ms), score,
       static_cast<WindowOpenDisposition>(windowOpenDisposition));
-  content_suggestions_service_->user_classifier()->OnSuggestionsUsed();
+  content_suggestions_service_->user_classifier()->OnEvent(
+      ntp_snippets::UserClassifier::Metric::SUGGESTIONS_USED);
 }
 
 void NTPSnippetsBridge::OnSuggestionMenuOpened(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jint global_position,
                                                jint category,
                                                jint category_position,
                                                jlong publish_timestamp_ms,
                                                jfloat score) {
   ntp_snippets::metrics::OnSuggestionMenuOpened(
       global_position, CategoryFromIDValue(category), category_position,
       TimeFromJavaTime(publish_timestamp_ms), score);
 }
 
 void NTPSnippetsBridge::OnMoreButtonShown(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj,
                                           jint category,
                                           jint position) {
   ntp_snippets::metrics::OnMoreButtonShown(CategoryFromIDValue(category),
                                            position);
 }
 
 void NTPSnippetsBridge::OnMoreButtonClicked(JNIEnv* env,
                                             const JavaParamRef<jobject>& obj,
                                             jint category,
                                             jint position) {
   ntp_snippets::metrics::OnMoreButtonClicked(CategoryFromIDValue(category),
                                              position);
-  content_suggestions_service_->user_classifier()->OnSuggestionsUsed();
+  content_suggestions_service_->user_classifier()->OnEvent(
+      ntp_snippets::UserClassifier::Metric::SUGGESTIONS_USED);
 }
 
 NTPSnippetsBridge::~NTPSnippetsBridge() {}
 
 void NTPSnippetsBridge::OnNewSuggestions(Category category) {
   if (observer_.is_null())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_SnippetsBridge_onNewSuggestions(env, observer_,
@@ skipping 38 matching lines @@
 }
 
 Category NTPSnippetsBridge::CategoryFromIDValue(jint id) {
   return content_suggestions_service_->category_factory()->FromIDValue(id);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }