Use {To/From}JavaTime for policy timestamps

components/policy/core/common/cloud/cloud_policy_service.cc

 // Copyright (c) 2012 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 "components/policy/core/common/cloud/cloud_policy_service.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 95 matching lines @@
   if (unregister_state_ == UNREGISTER_PENDING)
     UnregisterCompleted(false);
 }
 
 void CloudPolicyService::OnStoreLoaded(CloudPolicyStore* store) {
   // Update the client with state from the store.
   const em::PolicyData* policy(store_->policy());
 
   // Timestamp.
   base::Time policy_timestamp;
-  if (policy && policy->has_timestamp()) {
-    policy_timestamp =
-        base::Time::UnixEpoch() +
-        base::TimeDelta::FromMilliseconds(policy->timestamp());
-  }
+  if (policy && policy->has_timestamp())
+    policy_timestamp = base::Time::FromJavaTime(policy->timestamp());
   client_->set_last_policy_timestamp(policy_timestamp);
 
   // Public key version.
   if (policy && policy->has_public_key_version())
     client_->set_public_key_version(policy->public_key_version());
   else
     client_->clear_public_key_version();
 
   // Whether to submit the machine ID.
   bool submit_machine_id = false;
@@ skipping 55 matching lines @@
 
 void CloudPolicyService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void CloudPolicyService::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace policy