| Index: chrome/browser/android/history_report/history_report_jni_bridge.cc
|
| diff --git a/chrome/browser/android/history_report/history_report_jni_bridge.cc b/chrome/browser/android/history_report/history_report_jni_bridge.cc
|
| index 3892b5859d06fe4c8a1303f3065c97057d156744..9009662f59948368dadd4b52198ba7271d382a22 100644
|
| --- a/chrome/browser/android/history_report/history_report_jni_bridge.cc
|
| +++ b/chrome/browser/android/history_report/history_report_jni_bridge.cc
|
| @@ -101,13 +101,12 @@ base::android::ScopedJavaLocalRef<jobjectArray> HistoryReportJniBridge::Query(
|
| const DeltaFileEntryWithData& entry = (*entries)[i];
|
| max_seq_no = max_seq_no < entry.SeqNo() ? entry.SeqNo() : max_seq_no;
|
| history_report::Java_HistoryReportJniBridge_setDeltaFileEntry(
|
| - env, jentries_array.obj(), i, entry.SeqNo(),
|
| - base::android::ConvertUTF8ToJavaString(env, entry.Type()).obj(),
|
| - base::android::ConvertUTF8ToJavaString(env, entry.Id()).obj(),
|
| - base::android::ConvertUTF8ToJavaString(env, entry.Url()).obj(),
|
| - entry.Score(),
|
| - base::android::ConvertUTF16ToJavaString(env, entry.Title()).obj(),
|
| - base::android::ConvertUTF8ToJavaString(env, entry.IndexedUrl()).obj());
|
| + env, jentries_array, i, entry.SeqNo(),
|
| + base::android::ConvertUTF8ToJavaString(env, entry.Type()),
|
| + base::android::ConvertUTF8ToJavaString(env, entry.Id()),
|
| + base::android::ConvertUTF8ToJavaString(env, entry.Url()), entry.Score(),
|
| + base::android::ConvertUTF16ToJavaString(env, entry.Title()),
|
| + base::android::ConvertUTF8ToJavaString(env, entry.IndexedUrl()));
|
| }
|
|
|
| // Check if all entries from delta file were synced and start reporting usage
|
| @@ -132,9 +131,9 @@ HistoryReportJniBridge::GetUsageReportsBatch(JNIEnv* env,
|
| const UsageReport& report = (*reports)[i];
|
| std::string key = usage_report_util::ReportToKey(report);
|
| history_report::Java_HistoryReportJniBridge_setUsageReport(
|
| - env, jreports_array.obj(), i,
|
| - base::android::ConvertUTF8ToJavaString(env, key).obj(),
|
| - base::android::ConvertUTF8ToJavaString(env, report.id()).obj(),
|
| + env, jreports_array, i,
|
| + base::android::ConvertUTF8ToJavaString(env, key),
|
| + base::android::ConvertUTF8ToJavaString(env, report.id()),
|
| report.timestamp_ms(), report.typed_visit());
|
| }
|
| return jreports_array;
|
| @@ -153,30 +152,28 @@ void HistoryReportJniBridge::NotifyDataChanged() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
|
| if (!obj.is_null())
|
| - history_report::Java_HistoryReportJniBridge_onDataChanged(env, obj.obj());
|
| + history_report::Java_HistoryReportJniBridge_onDataChanged(env, obj);
|
| }
|
|
|
| void HistoryReportJniBridge::NotifyDataCleared() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
|
| if (!obj.is_null())
|
| - history_report::Java_HistoryReportJniBridge_onDataCleared(env, obj.obj());
|
| + history_report::Java_HistoryReportJniBridge_onDataCleared(env, obj);
|
| }
|
|
|
| void HistoryReportJniBridge::StopReporting() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
|
| if (!obj.is_null())
|
| - history_report::Java_HistoryReportJniBridge_stopReportingTask(env,
|
| - obj.obj());
|
| + history_report::Java_HistoryReportJniBridge_stopReportingTask(env, obj);
|
| }
|
|
|
| void HistoryReportJniBridge::StartReporting() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
|
| if (!obj.is_null())
|
| - history_report::Java_HistoryReportJniBridge_startReportingTask(env,
|
| - obj.obj());
|
| + history_report::Java_HistoryReportJniBridge_startReportingTask(env, obj);
|
| }
|
|
|
| jboolean HistoryReportJniBridge::AddHistoricVisitsToUsageReportsBuffer(
|
|
|