Primary histograms for InBrowserCleanerUI experiment

chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_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/chrome_cleaner_fetcher_win.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h"
 #include "chrome/install_static/install_details.h"
 #include "chrome/install_static/install_modes.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
@@ skipping 14 matching lines @@
   // Create a temporary directory name prefix like "ChromeCleaner_4_", where
   // "Chrome" is the product name and the 4 refers to the install mode of the
   // browser.
   int install_mode = install_static::InstallDetails::Get().install_mode_index();
   return base::StringPrintf(
       FILE_PATH_LITERAL("%" PRFilePath "%" PRFilePath "_%d_"),
       install_static::kProductPathName, FILE_PATH_LITERAL("Cleaner"),
       install_mode);
 }
 
+enum CleanerDownloadStatusHistogramValue {

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

Please add a comment saying this must say in sync with the enum in the histogram
file

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

Done.

+  CLEANER_DOWNLOAD_STATUS_SUCCEEDED = 0,
+  CLEANER_DOWNLOAD_STATUS_OTHER_FAILURE = 1,
+  CLEANER_DOWNLOAD_STATUS_NOT_FOUND_ON_SERVER = 2,
+  CLEANER_DOWNLOAD_STATUS_FAILED_TO_CREATE_TEMP_DIR = 3,
+
+  CLEANER_DOWNLOAD_STATUS_MAX,
+};
+
+void RecordCleanerDownloadStatusHistogram(
+    CleanerDownloadStatusHistogramValue value) {
+  UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.CleanerDownloadStatus", value,
+                            CLEANER_DOWNLOAD_STATUS_MAX);
+}
+
 // Class that will attempt to download the Chrome Cleaner executable and call a
 // given callback when done. Instances of ChromeCleanerFetcher own themselves
 // and will self-delete if they encounter an error or when the network request
 // has completed.
 class ChromeCleanerFetcher : public net::URLFetcherDelegate {
  public:
   explicit ChromeCleanerFetcher(ChromeCleanerFetchedCallback fetched_callback);
 
  protected:
   ~ChromeCleanerFetcher() override;
@@ skipping 54 matching lines @@
   return base::CreateNewTempDirectory(CleanerTempDirectoryPrefix(),
                                       &temp_dir) &&
          scoped_temp_dir_->Set(temp_dir);
 }
 
 void ChromeCleanerFetcher::OnTemporaryDirectoryCreated(bool success) {
   if (!success) {
     PostCallbackAndDeleteSelf(
         base::FilePath(),
         ChromeCleanerFetchStatus::kFailedToCreateTemporaryDirectory);
+    RecordCleanerDownloadStatusHistogram(

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

This should probably be move up a line so it is done before this object is
delete.

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

Done. Also did for the other calls.

+        CLEANER_DOWNLOAD_STATUS_FAILED_TO_CREATE_TEMP_DIR);
     return;
   }
 
   DCHECK(!scoped_temp_dir_->GetPath().empty());
 
   temp_file_ = scoped_temp_dir_->GetPath().Append(
       base::ASCIIToUTF16(base::GenerateGUID()) + L".tmp");
 
   data_use_measurement::DataUseUserData::AttachToFetcher(
       url_fetcher_.get(), data_use_measurement::DataUseUserData::SAFE_BROWSING);
@@ skipping 22 matching lines @@
 
 void ChromeCleanerFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
   // Take ownership of the fetcher in this scope (source == url_fetcher_).
   DCHECK_EQ(url_fetcher_.get(), source);
   DCHECK(!source->GetStatus().is_io_pending());
   DCHECK(fetched_callback_);
 
   if (source->GetResponseCode() == net::HTTP_NOT_FOUND) {
     PostCallbackAndDeleteSelf(base::FilePath(),
                               ChromeCleanerFetchStatus::kNotFoundOnServer);
+    RecordCleanerDownloadStatusHistogram(
+        CLEANER_DOWNLOAD_STATUS_NOT_FOUND_ON_SERVER);
     return;
   }
 
   base::FilePath download_path;
   if (!source->GetStatus().is_success() ||
       source->GetResponseCode() != net::HTTP_OK ||
       !source->GetResponseAsFilePath(/*take_ownership=*/true, &download_path)) {
     PostCallbackAndDeleteSelf(base::FilePath(),
                               ChromeCleanerFetchStatus::kOtherFailure);
+    RecordCleanerDownloadStatusHistogram(CLEANER_DOWNLOAD_STATUS_OTHER_FAILURE);
     return;
   }
 
   DCHECK(!download_path.empty());
   DCHECK_EQ(temp_file_.value(), download_path.value());
 
   // Take ownership of the scoped temp directory so it is not deleted.
   scoped_temp_dir_->Take();
 
   PostCallbackAndDeleteSelf(std::move(download_path),
                             ChromeCleanerFetchStatus::kSuccess);
+  RecordCleanerDownloadStatusHistogram(CLEANER_DOWNLOAD_STATUS_SUCCEEDED);
 }
 
 }  // namespace
 
 void FetchChromeCleaner(ChromeCleanerFetchedCallback fetched_callback) {
   new ChromeCleanerFetcher(std::move(fetched_callback));
 }
 
 }  // namespace safe_browsing