Chrome Cleaner: Fix issue where a tagged profile could be reset multiple times

chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc

 // Copyright 2017 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 "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
 
 #include <algorithm>
 #include <iterator>
 #include <memory>
 #include <utility>
@@ skipping 78 matching lines @@
       Profile* profile,
       std::unique_ptr<BrandcodedDefaultSettings> master_settings);
 
   // Removes the settings reset tag for |profile|. If there are no more
   // profiles to reset, invokes |done_callback_| and deletes this object.
   void OnResetCompleted(Profile* profile);
 
   // The profiles to be reset.
   std::vector<Profile*> profiles_to_reset_;
 
+  // The ProfileResetter objects that are used to reset each profile. We need to
+  // hold on to these until each reset operation has been completed.
+  std::vector<std::unique_ptr<ProfileResetter>> profile_resetters_;
+
   // The number of profiles that need to be reset.
   int num_pending_resets_;
 
   // The callback to be invoked once settings reset completes.
   base::OnceClosure done_callback_;
 
   std::unique_ptr<PostCleanupSettingsResetter::Delegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingsResetter);
 };
@@ skipping 24 matching lines @@
 }
 
 void SettingsResetter::OnFetchCompleted(
     Profile* profile,
     std::unique_ptr<BrandcodedDefaultSettings> master_settings) {
   static const ProfileResetter::ResettableFlags kSettingsToReset =
       ProfileResetter::DEFAULT_SEARCH_ENGINE | ProfileResetter::HOMEPAGE |
       ProfileResetter::EXTENSIONS | ProfileResetter::STARTUP_PAGES |
       ProfileResetter::SHORTCUTS;
 
-  delegate_->GetProfileResetter(profile)->Reset(
+  profile_resetters_.push_back(delegate_->GetProfileResetter(profile));
+  profile_resetters_.back()->Reset(

[ftirelo, 2017/06/22 11:04:39]

Would it make sense to DCHECK that this always happens on the same sequence?

[alito, 2017/06/22 17:44:11]

Done.

       kSettingsToReset, std::move(master_settings),
       base::Bind(&SettingsResetter::OnResetCompleted, this, profile));
 }
 
 void SettingsResetter::OnResetCompleted(Profile* profile) {
   DCHECK_LT(0, num_pending_resets_);
 
   RecordResetPending(false, profile);
 
   --num_pending_resets_;
@@ skipping 78 matching lines @@
 }
 
 // static
 void PostCleanupSettingsResetter::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   DCHECK(registry);
   registry->RegisterBooleanPref(prefs::kChromeCleanerResetPending, false);
 }
 
 }  // namespace safe_browsing