Add UMA reporting of reset request origin.

chrome/browser/ui/webui/options/reset_profile_settings_handler.cc

 // Copyright 2013 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/ui/webui/options/reset_profile_settings_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
-#include "chrome/browser/profile_resetter/profile_reset_report.pb.h"
 #include "chrome/browser/profile_resetter/profile_resetter.h"
 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 117 matching lines @@
       base::Bind(&ResetProfileSettingsHandler::OnShowResetProfileDialog,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("onHideResetProfileDialog",
       base::Bind(&ResetProfileSettingsHandler::OnHideResetProfileDialog,
                  base::Unretained(this)));
 }
 
 void ResetProfileSettingsHandler::HandleResetProfileSettings(
     const base::ListValue* value) {
   bool send_settings = false;
-  std::string reset_request_origin;
+  std::string request_origin_string;
   bool success = value->GetBoolean(0, &send_settings) &&
-                 value->GetString(1, &reset_request_origin);
+                 value->GetString(1, &request_origin_string);
   DCHECK(success);
 
   DCHECK(brandcode_.empty() || config_fetcher_);
+  reset_report::ChromeResetReport::ResetRequestOrigin request_origin =
+      ResetRequestOriginFromString(request_origin_string);
   if (config_fetcher_ && config_fetcher_->IsActive()) {
     // Reset once the prefs are fetched.
     config_fetcher_->SetCallback(
         base::Bind(&ResetProfileSettingsHandler::ResetProfile, Unretained(this),
-                   send_settings, reset_request_origin));
+                   send_settings, request_origin));
   } else {
-    ResetProfile(send_settings, reset_request_origin);
+    ResetProfile(send_settings, request_origin);
   }
 }
 
 void ResetProfileSettingsHandler::OnResetProfileSettingsDone(
     bool send_feedback,
-    const std::string& reset_request_origin) {
+    reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
   web_ui()->CallJavascriptFunctionUnsafe(
       "ResetProfileSettingsOverlay.doneResetting");
+
   if (send_feedback && setting_snapshot_) {
     Profile* profile = Profile::FromWebUI(web_ui());
     ResettableSettingsSnapshot current_snapshot(profile);
     int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
     if (difference) {
       setting_snapshot_->Subtract(current_snapshot);
       std::unique_ptr<reset_report::ChromeResetReport> report_proto =
           SerializeSettingsReportToProto(*setting_snapshot_, difference);
       if (report_proto) {
-        report_proto->set_reset_request_origin(
-            ResetRequestOriginFromString(reset_request_origin));
+        report_proto->set_reset_request_origin(request_origin);
         SendSettingsFeedbackProto(*report_proto, profile);
       }
     }
   }
   setting_snapshot_.reset();
 }
 
 void ResetProfileSettingsHandler::OnShowResetProfileDialog(
     const base::ListValue* value) {
   if (!resetter_->IsActive()) {
@@ skipping 20 matching lines @@
 }
 
 void ResetProfileSettingsHandler::OnSettingsFetched() {
   DCHECK(config_fetcher_);
   DCHECK(!config_fetcher_->IsActive());
   // The master prefs is fetched. We are waiting for user pressing 'Reset'.
 }
 
 void ResetProfileSettingsHandler::ResetProfile(
     bool send_settings,
-    const std::string& reset_request_origin) {
+    reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
   DCHECK(resetter_);
   DCHECK(!resetter_->IsActive());
 
   std::unique_ptr<BrandcodedDefaultSettings> default_settings;
   if (config_fetcher_) {
     DCHECK(!config_fetcher_->IsActive());
     default_settings = config_fetcher_->GetSettings();
     config_fetcher_.reset();
   } else {
     DCHECK(brandcode_.empty());
   }
 
   // If failed to fetch BrandcodedDefaultSettings or this is an organic
   // installation, use default settings.
   if (!default_settings)
     default_settings.reset(new BrandcodedDefaultSettings);
   resetter_->Reset(
       ProfileResetter::ALL, std::move(default_settings),
       base::Bind(&ResetProfileSettingsHandler::OnResetProfileSettingsDone,
-                 AsWeakPtr(), send_settings, reset_request_origin));
+                 AsWeakPtr(), send_settings, request_origin));
   content::RecordAction(base::UserMetricsAction("ResetProfile"));
   UMA_HISTOGRAM_BOOLEAN("ProfileReset.SendFeedback", send_settings);
+  UMA_HISTOGRAM_ENUMERATION(
+      "ProfileReset.ResetRequestOrigin", request_origin,
+      reset_report::ChromeResetReport::ResetRequestOrigin_MAX + 1);
 }
 
 void ResetProfileSettingsHandler::UpdateFeedbackUI() {
   if (!setting_snapshot_)
     return;
   std::unique_ptr<base::ListValue> list = GetReadableFeedbackForSnapshot(
       Profile::FromWebUI(web_ui()), *setting_snapshot_);
   base::DictionaryValue feedback_info;
   feedback_info.Set("feedbackInfo", list.release());
   web_ui()->CallJavascriptFunctionUnsafe(
       "ResetProfileSettingsOverlay.setFeedbackInfo", feedback_info);
 }
 
 }  // namespace options