Add origin of settings reset request to feedback reports.

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"
@@ skipping 18 matching lines @@
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
 #endif  // defined(OS_WIN)
 
 namespace options {
 
+namespace {
+
+reset_report::ChromeResetReport::ResetRequestOrigin
+ResetRequestOriginFromString(const std::string& reset_request_origin) {
+  static const char kOriginUserClick[] = "userclick";
+  static const char kOriginCct[] = "cct";
+  static const char kOriginTriggeredReset[] = "triggeredreset";
+
+  if (reset_request_origin == kOriginUserClick)
+    return reset_report::ChromeResetReport::RESET_REQUEST_ORIGIN_USER_CLICK;
+  if (reset_request_origin == kOriginCct)
+    return reset_report::ChromeResetReport::RESET_REQUEST_ORIGIN_CCT;
+  if (reset_request_origin == kOriginTriggeredReset) {
+    return reset_report::ChromeResetReport::
+        RESET_REQUEST_ORIGIN_TRIGGERED_RESET;
+  }
+  if (reset_request_origin.empty())
+    return reset_report::ChromeResetReport::RESET_REQUEST_ORIGIN_UNKNOWN;
+
+  NOTREACHED() << reset_request_origin;
+  return reset_report::ChromeResetReport::RESET_REQUEST_ORIGIN_UNKNOWN;

[Dan Beam, 2016/09/16 06:29:41]

if (!reset_requeat_origin.empty())
  NOTREACHED();

return RESET_REQUEST_ORIGIN_UNKNOWN;

[alito, 2016/09/16 17:10:18]

Done.

+}
+
+}  // namespace
+
 ResetProfileSettingsHandler::ResetProfileSettingsHandler() {
   google_brand::GetBrand(&brandcode_);
 }
 
 ResetProfileSettingsHandler::~ResetProfileSettingsHandler() {}
 
 void ResetProfileSettingsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   resetter_.reset(new ProfileResetter(profile));
 }
@@ skipping 71 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;
-  bool success = value->GetBoolean(0, &send_settings);
+  std::string reset_request_origin;
+  bool success = value->GetBoolean(0, &send_settings) &&
+                 value->GetString(1, &reset_request_origin);
   DCHECK(success);
 
   DCHECK(brandcode_.empty() || config_fetcher_);
   if (config_fetcher_ && config_fetcher_->IsActive()) {
     // Reset once the prefs are fetched.
     config_fetcher_->SetCallback(
-        base::Bind(&ResetProfileSettingsHandler::ResetProfile,
-                   Unretained(this),
-                   send_settings));
+        base::Bind(&ResetProfileSettingsHandler::ResetProfile, Unretained(this),
+                   send_settings, reset_request_origin));
   } else {
-    ResetProfile(send_settings);
+    ResetProfile(send_settings, reset_request_origin);
   }
 }
 
 void ResetProfileSettingsHandler::OnResetProfileSettingsDone(
-    bool send_feedback) {
+    bool send_feedback,
+    const std::string& reset_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)
+      if (report_proto) {
+        report_proto->set_reset_request_origin(
+            ResetRequestOriginFromString(reset_request_origin));
         SendSettingsFeedbackProto(*report_proto, profile);
+      }
     }
   }
   setting_snapshot_.reset();
 }
 
 void ResetProfileSettingsHandler::OnShowResetProfileDialog(
     const base::ListValue* value) {
   if (!resetter_->IsActive()) {
     setting_snapshot_.reset(
         new ResettableSettingsSnapshot(Profile::FromWebUI(web_ui())));
@@ skipping 16 matching lines @@
   if (!resetter_->IsActive())
     setting_snapshot_.reset();
 }
 
 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) {
+void ResetProfileSettingsHandler::ResetProfile(
+    bool send_settings,
+    const std::string& reset_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));
+                 AsWeakPtr(), send_settings, reset_request_origin));
   content::RecordAction(base::UserMetricsAction("ResetProfile"));
   UMA_HISTOGRAM_BOOLEAN("ProfileReset.SendFeedback", send_settings);
 }
 
 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