Revert of Send a TrackedPreference incident when registry pref validation fails.

components/user_prefs/tracked/tracked_split_preference.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/user_prefs/tracked/tracked_split_preference.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 46 matching lines @@
   std::vector<std::string> invalid_keys;
   PrefHashStoreTransaction::ValueState value_state =
       transaction->CheckSplitValue(pref_path_, dict_value, &invalid_keys);
 
   if (value_state == PrefHashStoreTransaction::CHANGED)
     helper_.ReportSplitPreferenceChangedCount(invalid_keys.size());
 
   helper_.ReportValidationResult(value_state, transaction->GetStoreUMASuffix());
 
   PrefHashStoreTransaction::ValueState external_validation_value_state =
-      PrefHashStoreTransaction::UNSUPPORTED;
+      PrefHashStoreTransaction::UNCHANGED;
   if (external_validation_transaction) {
     std::vector<std::string> invalid_external_validation_keys;
     external_validation_value_state =
         external_validation_transaction->CheckSplitValue(
             pref_path_, dict_value, &invalid_external_validation_keys);
     helper_.ReportValidationResult(
         external_validation_value_state,
         external_validation_transaction->GetStoreUMASuffix());
+
+    // TODO(proberge): Call delegate_->OnSplitPreferenceValidation.
   }
 
   if (delegate_) {
-    delegate_->OnSplitPreferenceValidation(
-        pref_path_, dict_value, invalid_keys, value_state,
-        external_validation_value_state, helper_.IsPersonal());
+    delegate_->OnSplitPreferenceValidation(pref_path_, dict_value, invalid_keys,
+                                           value_state, helper_.IsPersonal());
   }
   TrackedPreferenceHelper::ResetAction reset_action =
       helper_.GetAction(value_state);
   helper_.ReportAction(reset_action);
 
   bool was_reset = false;
   if (reset_action == TrackedPreferenceHelper::DO_RESET) {
     if (value_state == PrefHashStoreTransaction::CHANGED) {
       DCHECK(!invalid_keys.empty());
 
@@ skipping 20 matching lines @@
       (was_reset ||
        external_validation_value_state !=
            PrefHashStoreTransaction::UNCHANGED)) {
     const base::DictionaryValue* new_dict_value = nullptr;
     pref_store_contents->GetDictionary(pref_path_, &new_dict_value);
     external_validation_transaction->StoreSplitHash(pref_path_, new_dict_value);
   }
 
   return was_reset;
 }