Integrate UI and reset logic into AutomaticProfileResetter.

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/profile_resetter/automatic_profile_resetter.h"
+#include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.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_resetter.h"
 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace options {
 
 ResetProfileSettingsHandler::ResetProfileSettingsHandler() {
   google_util::GetBrand(&brandcode_);
 }
 
 ResetProfileSettingsHandler::~ResetProfileSettingsHandler() {
+  // Will be ignored if it was already called in OnResetProfileSettingsDone.
+  automatic_profile_resetter_->NotifyDidCloseWebUIResetDialog(
+      false /*performed_reset*/);
 }
 
 void ResetProfileSettingsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   resetter_.reset(new ProfileResetter(profile));
+  automatic_profile_resetter_ =
+      AutomaticProfileResetterFactory::GetForBrowserContext(profile);
+  DCHECK(automatic_profile_resetter_);
 }
 
 void ResetProfileSettingsHandler::InitializePage() {
   web_ui()->CallJavascriptFunction(
       "ResetProfileSettingsOverlay.setResettingState",
       base::FundamentalValue(resetter_->IsActive()));
 }
 
 void ResetProfileSettingsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
@@ skipping 45 matching lines @@
 void ResetProfileSettingsHandler::OnResetProfileSettingsDone() {
   web_ui()->CallJavascriptFunction("ResetProfileSettingsOverlay.doneResetting");
   if (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::string report = SerializeSettingsReport(*setting_snapshot_,
                                                    difference);
-      SendSettingsFeedback(report, profile, PROFILE_RESET_WEBUI);
+      bool is_reset_prompt_active =
+          automatic_profile_resetter_->IsResetPromptActive();
+      SendSettingsFeedback(report, profile, is_reset_prompt_active ?
+          PROFILE_RESET_PROMPT : PROFILE_RESET_WEBUI);
     }
     setting_snapshot_.reset();
   }
+  automatic_profile_resetter_->NotifyDidCloseWebUIResetDialog(
+      true /*performed_reset*/);
 }
 
 void ResetProfileSettingsHandler::OnShowResetProfileDialog(const ListValue*) {
   DictionaryValue flashInfo;
   flashInfo.Set("feedbackInfo", GetReadableFeedback(
       Profile::FromWebUI(web_ui())));
   web_ui()->CallJavascriptFunction(
       "ResetProfileSettingsOverlay.setFeedbackInfo",
       flashInfo);
 
+  automatic_profile_resetter_->NotifyDidOpenWebUIResetDialog();
+
   if (brandcode_.empty())
     return;
   config_fetcher_.reset(new BrandcodeConfigFetcher(
       base::Bind(&ResetProfileSettingsHandler::OnSettingsFetched,
                  Unretained(this)),
       GURL("https://tools.google.com/service/update2"),
       brandcode_));
 }
 
 void ResetProfileSettingsHandler::OnSettingsFetched() {
@@ skipping 25 matching lines @@
   resetter_->Reset(
       ProfileResetter::ALL,
       default_settings.Pass(),
       base::Bind(&ResetProfileSettingsHandler::OnResetProfileSettingsDone,
                  AsWeakPtr()));
   content::RecordAction(content::UserMetricsAction("ResetProfile"));
   UMA_HISTOGRAM_BOOLEAN("ProfileReset.SendFeedback", send_settings);
 }
 
 }  // namespace options