Revert of Implemented clearing Java prefs after pulling variations first run seed from Java to C++ side

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/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"
 
-#if defined(OS_ANDROID)
-#include "components/variations/android/variations_seed_bridge.h"
-#endif  // OS_ANDROID
-
 namespace variations {
 
 namespace {
 
 // Signature verification is disabled on mobile platforms for now, since it
 // adds about ~15ms to the startup time on mobile (vs. a couple ms on desktop).
 bool SignatureVerificationEnabled() {
 #if defined(OS_IOS) || defined(OS_ANDROID)
   return false;
 #else
@@ skipping 347 matching lines @@
   // 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)) {
     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) {
   std::string base64_seed_data =
       local_state_->GetString(prefs::kVariationsCompressedSeed);
   const bool is_compressed = !base64_seed_data.empty();
   // If there's no compressed seed, fall back to the uncompressed one.
   if (!is_compressed)
@@ skipping 59 matching lines @@
     return false;
   }
 
   std::string base64_seed_data;
   base::Base64Encode(compressed_seed_data, &base64_seed_data);
 
   // TODO(asvitkine): This pref is no longer being used. Remove it completely
   // in M45+.
   local_state_->ClearPref(prefs::kVariationsSeed);
 
-#if defined(OS_ANDROID)
-  // If currently we do not have any stored pref then we mark seed storing as
-  // successful on the Java side of Chrome for Android to avoid repeated seed
-  // fetches and clear preferences on the Java side.
-  if (local_state_->GetString(prefs::kVariationsCompressedSeed).empty()) {
-    android::MarkVariationsSeedAsStored();
-    android::ClearJavaFirstRunPrefs();
-  }
-#endif
-
   // Update the saved country code only if one was returned from the server.
   // Prefer the country code that was transmitted in the header over the one in
   // the seed (which is deprecated).
   if (!country_code.empty())
     local_state_->SetString(prefs::kVariationsCountry, country_code);
   else if (seed.has_country_code())
     local_state_->SetString(prefs::kVariationsCountry, seed.country_code());
 
   local_state_->SetString(prefs::kVariationsCompressedSeed, base64_seed_data);
   UpdateSeedDateAndLogDayChange(date_fetched);
@@ skipping 53 matching lines @@
   }
   return true;
 }
 
 void VariationsSeedStore::ReportUnsupportedSeedFormatError() {
   RecordSeedStoreHistogram(
       VARIATIONS_SEED_STORE_FAILED_UNSUPPORTED_SEED_FORMAT);
 }
 
 }  // namespace variations