[Android History] Add support for removing items

chrome/browser/android/history/browsing_history_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/history/browsing_history_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/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "components/url_formatter/url_formatter.h"
 #include "jni/BrowsingHistoryBridge_jni.h"
 
 const int kMaxQueryCount = 100;
 
@@ skipping 39 matching lines @@
   for (auto it = results->begin(); it != results->end(); ++it) {
 
     // TODO(twellington): move the domain logic to BrowsingHistoryServce so it
     // can be shared with BrowsingHistoryHandler.
     base::string16 domain = url_formatter::IDNToUnicode(it->url.host());
     // When the domain is empty, use the scheme instead. This allows for a
     // sensible treatment of e.g. file: URLs when group by domain is on.
     if (domain.empty())
       domain = base::UTF8ToUTF16(it->url.scheme() + ":");
 
+    std::vector<int64_t> timestamps;
+    for (auto timestampIt = it->all_timestamps.begin();
+         timestampIt != it->all_timestamps.end(); ++timestampIt) {
+      timestamps.push_back(
+          base::Time::FromInternalValue(*timestampIt).ToJavaTime());
+    }
+
     Java_BrowsingHistoryBridge_createHistoryItemAndAddToList(
         env,
         j_query_result_obj_.obj(),
         base::android::ConvertUTF8ToJavaString(env, it->url.spec()),
         base::android::ConvertUTF16ToJavaString(env, domain),
         base::android::ConvertUTF16ToJavaString(env, it->title),
-        it->time.ToJavaTime());
+        base::android::ToJavaLongArray(env, timestamps));
+
+    timestamps.clear();
   }
 
   Java_BrowsingHistoryBridge_onQueryHistoryComplete(
       env,
       j_history_service_obj_.obj(),
       j_query_result_obj_.obj());
 
   j_query_result_obj_.Release();
 }
 
+void BrowsingHistoryBridge::MarkItemForRemoval(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jstring j_url,
+    const JavaParamRef<jlongArray>& j_timestamps) {
+  std::unique_ptr<BrowsingHistoryService::HistoryEntry> entry(
+              new BrowsingHistoryService::HistoryEntry());

[gone, 2016/12/08 21:21:56]

git cl format?

[Theresa, 2016/12/08 21:51:15]

Done.

+  entry->url = GURL(base::android::ConvertJavaStringToUTF16(env, j_url));
+
+  std::vector<int64_t> timestamps;
+  base::android::JavaLongArrayToInt64Vector(
+      env, j_timestamps.obj(), &timestamps);
+  for (auto it = timestamps.begin(); it != timestamps.end(); ++it) {
+    base::Time visit_time = base::Time::FromJavaTime(*it);
+    entry->all_timestamps.insert(visit_time.ToInternalValue());
+  }
+
+  items_to_remove_.push_back(std::move(entry));
+  timestamps.clear();
+}
+
+void BrowsingHistoryBridge::RemoveItems(JNIEnv* env,
+                                        const JavaParamRef<jobject>& obj) {
+  browsing_history_service_->RemoveVisits(&items_to_remove_);
+  items_to_remove_.clear();
+}
+
 void BrowsingHistoryBridge::OnRemoveVisitsComplete() {
-  // TODO(twellington): implement
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_BrowsingHistoryBridge_onRemoveComplete(
+      env, j_history_service_obj_.obj());
 }
 
 void BrowsingHistoryBridge::OnRemoveVisitsFailed() {
-  // TODO(twellington): implement
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_BrowsingHistoryBridge_onRemoveFailed(env, j_history_service_obj_.obj());
 }
 
 void BrowsingHistoryBridge::HistoryDeleted() {
-  // TODO(twellington): implement
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_BrowsingHistoryBridge_onHistoryDeleted(
+      env, j_history_service_obj_.obj());
 }
 
 void BrowsingHistoryBridge::HasOtherFormsOfBrowsingHistory(
     bool has_other_forms, bool has_synced_results) {
   // TODO(twellington): implement
 }
 
 bool RegisterBrowsingHistoryBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& j_profile) {
   BrowsingHistoryBridge* bridge =
       new BrowsingHistoryBridge(env, obj, j_profile);
   return reinterpret_cast<intptr_t>(bridge);
 }