Removed callbacks to JNI functions + added gzip compressed seed support & pulling response time

components/variations/variations_seed_store.cc

 // Copyright 2014 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/variations/variations_seed_store.h"
 
 #include "base/base64.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_math.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/compression/compression_utils.h"
+#include "components/variations/android/variations_seed_bridge.h"

[Alexei Svitkine (slow), 2015/11/12 22:25:29]

Put this include in ifdef and put it below the other includes.

Since it includes <jni.h> it won't compile on other platforms.

[Alexander Agulenko, 2015/11/12 22:37:55]

Done.

 #include "components/variations/pref_names.h"
 #include "components/variations/proto/variations_seed.pb.h"
 #include "crypto/signature_verifier.h"
 #include "third_party/protobuf/src/google/protobuf/io/coded_stream.h"
 
 namespace variations {
 
 namespace {
 
 // Signature verification is disabled on mobile platforms for now, since it
@@ skipping 327 matching lines @@
 void VariationsSeedStore::ClearPrefs() {
   local_state_->ClearPref(prefs::kVariationsCompressedSeed);
   local_state_->ClearPref(prefs::kVariationsSeed);
   local_state_->ClearPref(prefs::kVariationsSeedDate);
   local_state_->ClearPref(prefs::kVariationsSeedSignature);
 }
 
 #if defined(OS_ANDROID)
 void VariationsSeedStore::ImportFirstRunJavaSeed() {
   DVLOG(1) << "Importing first run seed from Java preferences.";
-  if (get_variations_first_run_seed_.is_null()) {
-    RecordFirstRunResult(FIRST_RUN_SEED_IMPORT_FAIL_NO_CALLBACK);
-    return;
-  }
 
   std::string seed_data;
   std::string seed_signature;
   std::string seed_country;
-  get_variations_first_run_seed_.Run(&seed_data, &seed_signature,
-                                     &seed_country);
+  std::string response_time;
+  base::Time current_time;
+  bool is_gzip_compressed;

[Alexei Svitkine (slow), 2015/11/12 22:25:29]

Move this right above the time parsing code.

[Alexander Agulenko, 2015/11/12 22:37:55]

Done.

+
+  android::GetVariationsFirstRunSeed(&seed_data, &seed_signature, &seed_country,
+                                     &response_time, &is_gzip_compressed);
   if (seed_data.empty()) {
     RecordFirstRunResult(FIRST_RUN_SEED_IMPORT_FAIL_NO_FIRST_RUN_SEED);
     return;
   }
+  base::Time::FromString(response_time.c_str(), &current_time);

[Alexei Svitkine (slow), 2015/11/12 22:25:29]

To match how we do it on the C++ side, this should be Time::FromUTCString().

https://code.google.com/p/chromium/codesearch#chromium/src/net/http/http_resp...

[Alexander Agulenko, 2015/11/12 22:37:55]

Done.

 
-  // TODO(agulenko): Pull actual time from the response.
-  base::Time current_time = base::Time::Now();
-
-  // TODO(agulenko): Support gzip compressed seed.
   if (!StoreSeedData(seed_data, seed_signature, seed_country, current_time,
-                     false, false, nullptr)) {
+                     false, is_gzip_compressed, nullptr)) {
     RecordFirstRunResult(FIRST_RUN_SEED_IMPORT_FAIL_STORE_FAILED);
     LOG(WARNING) << "First run variations seed is invalid.";
     return;
   }
   // TODO(agulenko): Clear Java prefs.
   RecordFirstRunResult(FIRST_RUN_SEED_IMPORT_SUCCESS);
 }
 #endif  // OS_ANDROID
 
 bool VariationsSeedStore::ReadSeedData(std::string* seed_data) {
@@ skipping 137 matching lines @@
   }
   return true;
 }
 
 void VariationsSeedStore::ReportUnsupportedSeedFormatError() {
   RecordSeedStoreHistogram(
       VARIATIONS_SEED_STORE_FAILED_UNSUPPORTED_SEED_FORMAT);
 }
 
 }  // namespace variations