[Android History] Add clear browsing data button and privacy disclaimers

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"
@@ skipping 25 matching lines @@
 void BrowsingHistoryBridge::QueryHistory(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& j_result_obj,
     jstring j_query,
     int64_t j_query_end_time) {
   j_query_result_obj_.Reset(env, j_result_obj);
 
   history::QueryOptions options;
   options.max_count = kMaxQueryCount;
-  options.end_time = base::Time::FromJavaTime(j_query_end_time);
+  if (j_query_end_time == 0) {
+    options.end_time = base::Time();
+  } else {
+    options.end_time = base::Time::FromJavaTime(j_query_end_time);
+  }
   options.duplicate_policy = history::QueryOptions::REMOVE_DUPLICATES_PER_DAY;
 
   browsing_history_service_->QueryHistory(
       base::android::ConvertJavaStringToUTF16(env, j_query), options);
 }
 
 // BrowsingHistoryServiceHandler implementation
 void BrowsingHistoryBridge::OnQueryComplete(
     std::vector<BrowsingHistoryService::HistoryEntry>* results,
     BrowsingHistoryService::QueryResultsInfo* query_results_info) {
@@ skipping 74 matching lines @@
 }
 
 void BrowsingHistoryBridge::HistoryDeleted() {
   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
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_BrowsingHistoryBridge_hasOtherFormsOfBrowsingData(
+      env, j_history_service_obj_.obj(), has_other_forms, has_synced_results);
 }
 
 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);
 }