| 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 36d6cd75d8b5e23660bc0f0c2a0a9ea8d53c781c..90bbec133e5af4e0e824e1c6d657653eb1f0d843 100644
|
| --- a/chrome/browser/android/history_report/history_report_jni_bridge.cc
|
| +++ b/chrome/browser/android/history_report/history_report_jni_bridge.cc
|
| @@ -94,17 +94,13 @@ 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()).Release(),
|
| - base::android::ConvertUTF8ToJavaString(env, entry.Id()).Release(),
|
| - base::android::ConvertUTF8ToJavaString(env, entry.Url()).Release(),
|
| + 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()).Release(),
|
| - base::android::ConvertUTF8ToJavaString(env,
|
| - entry.IndexedUrl()).Release());
|
| + base::android::ConvertUTF16ToJavaString(env, entry.Title()).obj(),
|
| + base::android::ConvertUTF8ToJavaString(env, entry.IndexedUrl()).obj());
|
| }
|
|
|
| // Check if all entries from delta file were synced and start reporting usage
|
| @@ -129,13 +125,10 @@ 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).Release(),
|
| - base::android::ConvertUTF8ToJavaString(env, report.id()).Release(),
|
| - report.timestamp_ms(),
|
| - report.typed_visit());
|
| + env, jreports_array.obj(), i,
|
| + base::android::ConvertUTF8ToJavaString(env, key).obj(),
|
| + base::android::ConvertUTF8ToJavaString(env, report.id()).obj(),
|
| + report.timestamp_ms(), report.typed_visit());
|
| }
|
| return jreports_array;
|
| }
|
|
|