Primary histograms for InBrowserCleanerUI experiment

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>
 #include <vector>
 
 #include "base/barrier_closure.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/sequence_checker.h"
 #include "base/synchronization/lock.h"
 #include "base/win/registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile_resetter/profile_resetter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 130 matching lines @@
       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_;
-  if (!num_pending_resets_)
+  if (!num_pending_resets_) {

[csharp, 2017/07/07 17:32:51]

nit: No need for the braces since this is a single line

[ftirelo, 2017/07/07 20:27:53]

Done.

     std::move(done_callback_).Run();
+  }
 }
 
 // Returns true if there is information of a completed cleanup in the registry.
 bool CleanupCompletedFromRegistry() {
   base::string16 cleaner_key_path(
       chrome_cleaner::kSoftwareRemovalToolRegistryKey);
   cleaner_key_path.append(L"\\").append(chrome_cleaner::kCleanerSubKey);
 
   base::win::RegKey srt_cleaner_key(HKEY_CURRENT_USER, cleaner_key_path.c_str(),
                                     KEY_QUERY_VALUE);
@@ skipping 33 matching lines @@
 PostCleanupSettingsResetter::Delegate::GetProfileResetter(Profile* profile) {
   return base::MakeUnique<ProfileResetter>(profile);
 }
 
 void PostCleanupSettingsResetter::TagForResetting(Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(IsEnabled());
   DCHECK(profile);
 
   RecordResetPending(true, profile);
+  UMA_HISTOGRAM_BOOLEAN("SoftwareReporter.TaggedProfileForResetting", true);
 }
 
 void PostCleanupSettingsResetter::ResetTaggedProfiles(
     std::vector<Profile*> profiles,
     base::OnceClosure done_callback,
     std::unique_ptr<PostCleanupSettingsResetter::Delegate> delegate) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(IsEnabled());
   DCHECK(delegate);
 
   std::vector<Profile*> profiles_to_reset;
   if (!CopyProfilesToReset(profiles, &profiles_to_reset) ||
       !CleanupCompletedFromRegistry()) {
     std::move(done_callback).Run();
     return;
   }
 
+  UMA_HISTOGRAM_EXACT_LINEAR("SoftwareReporter.PostCleanupSettingsReset",
+                             profiles_to_reset.size());
+
   // The SettingsResetter object will self-delete once |done_callback| is
   // invoked.
   make_scoped_refptr(new SettingsResetter(std::move(profiles_to_reset),
                                           std::move(delegate),
                                           std::move(done_callback)))
       ->Run();
 }
 
 // static
 void PostCleanupSettingsResetter::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   DCHECK(registry);
   registry->RegisterBooleanPref(prefs::kChromeCleanerResetPending, false);
 }
 
 }  // namespace safe_browsing