Revert "Eliminate all code related to the AutomaticProfileResetter."

chrome/browser/profile_resetter/resettable_settings_snapshot.cc

 // Copyright (c) 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/profile_resetter/resettable_settings_snapshot.h"
 
 #include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "components/feedback/feedback_util.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_registry.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using feedback::FeedbackData;
 
 namespace {
 
-// Feedback bucket label.
+// Feedback bucket labels.
+const char kProfileResetPromptBucket[] = "SamplingOfSettingsResetPrompt";
 const char kProfileResetWebUIBucket[] = "ProfileResetReport";
 
 // Dictionary keys for feedback report.
 const char kDefaultSearchEnginePath[] = "default_search_engine";
 const char kEnabledExtensions[] = "enabled_extensions";
 const char kHomepageIsNewTabPage[] = "homepage_is_ntp";
 const char kHomepagePath[] = "homepage";
 const char kShortcuts[] = "shortcuts";
 const char kShowHomeButton[] = "show_home_button";
 const char kStartupTypePath[] = "startup_type";
@@ skipping 169 matching lines @@
 
   COMPILE_ASSERT(ResettableSettingsSnapshot::ALL_FIELDS == 31,
                  serialize_new_field_here);
 
   std::string json;
   base::JSONWriter::Write(&dict, &json);
   return json;
 }
 
 void SendSettingsFeedback(const std::string& report,
-                          Profile* profile) {
+                          Profile* profile,
+                          SnapshotCaller caller) {
   scoped_refptr<FeedbackData> feedback_data = new FeedbackData();
-  feedback_data->set_category_tag(kProfileResetWebUIBucket);
+  std::string bucket;
+  switch (caller) {
+    case PROFILE_RESET_WEBUI:
+      bucket = kProfileResetWebUIBucket;
+      break;
+    case PROFILE_RESET_PROMPT:
+      bucket = kProfileResetPromptBucket;
+      break;
+  }
+  feedback_data->set_category_tag(bucket);
   feedback_data->set_description(report);
 
   feedback_data->set_image(make_scoped_ptr(new std::string));
   feedback_data->set_context(profile);
 
   feedback_data->set_page_url("");
   feedback_data->set_user_email("");
 
   feedback_util::SendReport(feedback_data);
 }
@@ skipping 113 matching lines @@
       extension_names += '\n';
     extension_names += i->second;
   }
   if (!extension_names.empty()) {
     AddPair(list.get(),
             l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS),
             extension_names);
   }
   return list.Pass();
 }