Refine tracking of snippet dismissals.

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/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "components/history/core/browser/history_service.h"
 #include "components/ntp_snippets/ntp_snippet.h"
 #include "components/ntp_snippets/ntp_snippets_service.h"
 #include "jni/SnippetsBridge_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
+using base::android::ConvertUTF8ToJavaString;

[Bernhard Bauer, 2016/04/21 16:19:27]

This doesn't seem to be necessary.

[PEConn, 2016/04/21 16:35:40]

Done.

 using base::android::JavaParamRef;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ToJavaLongArray;
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& j_profile) {
   NTPSnippetsBridge* snippets_bridge = new NTPSnippetsBridge(env, j_profile);
   return reinterpret_cast<intptr_t>(snippets_bridge);
 }
@@ skipping 10 matching lines @@
                                const JavaParamRef<jclass>& caller) {
   Profile* profile = ProfileManager::GetLastUsedProfile();
   NTPSnippetsServiceFactory::GetForProfile(profile)->RescheduleFetching();
 }
 
 NTPSnippetsBridge::NTPSnippetsBridge(JNIEnv* env,
                                      const JavaParamRef<jobject>& j_profile)
     : snippet_service_observer_(this) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
   ntp_snippets_service_ = NTPSnippetsServiceFactory::GetForProfile(profile);
+  history_service_ =
+      HistoryServiceFactory::GetForProfile(profile,
+                                           ServiceAccessType::EXPLICIT_ACCESS);
   snippet_service_observer_.Add(ntp_snippets_service_);
 }
 
 void NTPSnippetsBridge::SetObserver(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
                                     const JavaParamRef<jobject>& j_observer) {
   observer_.Reset(env, j_observer);
   NTPSnippetsServiceLoaded();
 }
 
 NTPSnippetsBridge::~NTPSnippetsBridge() {}
 
 void NTPSnippetsBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void NTPSnippetsBridge::DiscardSnippet(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj,
                                        const JavaParamRef<jstring>& url) {
   ntp_snippets_service_->DiscardSnippet(
       GURL(ConvertJavaStringToUTF8(env, url)));
 }
 
+void SnippetVisitedHistoryRequestCallback(

[Bernhard Bauer, 2016/04/21 16:19:27]

Move this into an anonymous namespace?

[PEConn, 2016/04/21 16:35:40]

Done.

+      base::android::ScopedJavaGlobalRef<jobject> callback,
+      bool success,
+      const history::URLRow& row,
+      const history::VisitVector& visitVector) {
+  bool visited = success && row.visit_count() != 0;
+
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_SnippetsBridge_runCallback(env, callback.obj(),
+                                  static_cast<jboolean>(visited));
+}
+
+void NTPSnippetsBridge::SnippetVisited(JNIEnv* env,
+                                       const JavaParamRef<jobject>& obj,
+                                       const JavaParamRef<jobject>& jcallback,
+                                       const JavaParamRef<jstring>& jurl) {
+  base::android::ScopedJavaGlobalRef<jobject> callback(jcallback);
+
+  history_service_->QueryURL(
+      GURL(ConvertJavaStringToUTF8(env, jurl)),
+      false,
+      base::Bind(&SnippetVisitedHistoryRequestCallback, callback),
+      &tracker_);
+}
+
 void NTPSnippetsBridge::NTPSnippetsServiceLoaded() {
   if (observer_.is_null())
     return;
 
   std::vector<std::string> titles;
   std::vector<std::string> urls;
   std::vector<std::string> thumbnail_urls;
   std::vector<std::string> snippets;
   std::vector<int64_t> timestamps;
   for (const ntp_snippets::NTPSnippet& snippet : *ntp_snippets_service_) {
@@ skipping 15 matching lines @@
 
 void NTPSnippetsBridge::NTPSnippetsServiceShutdown() {
   observer_.Reset();
   snippet_service_observer_.Remove(ntp_snippets_service_);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }