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/android/variations_seed_bridge.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"
 
 namespace variations {
 
 namespace {
 
 // Signature verification is disabled on mobile platforms for now, since it
@@ skipping 432 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 currently we do not have any stored pref then we clear prefs on the

[Alexei Svitkine (slow), 2015/11/12 17:42:17]

Add an ifdef around this block

[Alexander Agulenko, 2015/11/12 18:55:04]

Done.

+  // Java side of Chrome for Android.
+  if (local_state_->GetString(prefs::kVariationsCompressedSeed).empty()) {

[Alexei Svitkine (slow), 2015/11/12 17:42:17]

Nit: No {}'s

[Alexander Agulenko, 2015/11/12 18:55:04]

Added another function call to this block, so {}'s are needed now.

+    android::ClearJavaFirstRunPrefs();
+  }
+
   // 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