Add base::time::FromJavaTime

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 <utility>
 #include <vector>
 
@@ skipping 28 matching lines @@
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaIntArray;
 using ntp_snippets::Category;
 using ntp_snippets::CategoryInfo;
 using ntp_snippets::CategoryStatus;
 using ntp_snippets::KnownCategories;
 using ntp_snippets::ContentSuggestion;
 
 namespace {
 
-// TODO(treib): Move this into the Time class itself.
-base::Time TimeFromJavaTime(jlong timestamp_ms) {
-  return base::Time::UnixEpoch() +
-         base::TimeDelta::FromMilliseconds(timestamp_ms);
-}
-
 // Converts a vector of ContentSuggestions to its Java equivalent.
 ScopedJavaLocalRef<jobject> ToJavaSuggestionList(
     JNIEnv* env,
     const Category& category,
     const std::vector<ContentSuggestion>& suggestions) {
   ScopedJavaLocalRef<jobject> result =
       Java_SnippetsBridge_createSuggestionList(env);
   for (const ContentSuggestion& suggestion : suggestions) {
     ScopedJavaLocalRef<jobject> java_suggestion =
         Java_SnippetsBridge_addSuggestion(
@@ skipping 286 matching lines @@
 
 void NTPSnippetsBridge::OnSuggestionShown(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj,
                                           jint global_position,
                                           jint j_category_id,
                                           jint category_position,
                                           jlong publish_timestamp_ms,
                                           jfloat score) {
   ntp_snippets::metrics::OnSuggestionShown(
       global_position, CategoryFromIDValue(j_category_id), category_position,
-      TimeFromJavaTime(publish_timestamp_ms), score);
+      base::Time::FromJavaTime(publish_timestamp_ms), score);
   if (global_position == 0) {
     content_suggestions_service_->user_classifier()->OnEvent(
         ntp_snippets::UserClassifier::Metric::SUGGESTIONS_SHOWN);
   }
 }
 
 void NTPSnippetsBridge::OnSuggestionOpened(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj,
                                            jint global_position,
                                            jint j_category_id,
                                            jint category_position,
                                            jlong publish_timestamp_ms,
                                            jfloat score,
                                            int windowOpenDisposition) {
   ntp_snippets::metrics::OnSuggestionOpened(
       global_position, CategoryFromIDValue(j_category_id), category_position,
-      TimeFromJavaTime(publish_timestamp_ms), score,
+      base::Time::FromJavaTime(publish_timestamp_ms), score,
       static_cast<WindowOpenDisposition>(windowOpenDisposition));
   content_suggestions_service_->user_classifier()->OnEvent(
       ntp_snippets::UserClassifier::Metric::SUGGESTIONS_USED);
 }
 
 void NTPSnippetsBridge::OnSuggestionMenuOpened(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jint global_position,
                                                jint j_category_id,
                                                jint category_position,
                                                jlong publish_timestamp_ms,
                                                jfloat score) {
   ntp_snippets::metrics::OnSuggestionMenuOpened(
       global_position, CategoryFromIDValue(j_category_id), category_position,
-      TimeFromJavaTime(publish_timestamp_ms), score);
+      base::Time::FromJavaTime(publish_timestamp_ms), score);
 }
 
 void NTPSnippetsBridge::OnMoreButtonShown(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj,
                                           jint j_category_id,
                                           jint position) {
   ntp_snippets::metrics::OnMoreButtonShown(CategoryFromIDValue(j_category_id),
                                            position);
 }
 
@@ skipping 78 matching lines @@
 }
 
 Category NTPSnippetsBridge::CategoryFromIDValue(jint id) {
   return content_suggestions_service_->category_factory()->FromIDValue(id);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }