Integrate UI and reset logic into AutomaticProfileResetter.

chrome/browser/profile_resetter/automatic_profile_resetter_unittest.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/profile_resetter/automatic_profile_resetter.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 15 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Invoke;
+using testing::WithArgs;
 
 namespace {
 
 const char kAutomaticProfileResetStudyName[] = "AutomaticProfileReset";
 const char kStudyDisabledGroupName[] = "Disabled";
 const char kStudyDryRunGroupName[] = "DryRun";
 const char kStudyEnabledGroupName[] = "Enabled";
 
 const char kTestHashSeed[] = "testing-hash-seed";
 const char kTestMementoValue[] = "01234567890123456789012345678901";
@@ skipping 13 matching lines @@
 
 // A testing version of the AutomaticProfileResetter that differs from the real
 // one only in that it has its statistics reporting mocked out for verification.
 class AutomaticProfileResetterUnderTest : public AutomaticProfileResetter {
  public:
   explicit AutomaticProfileResetterUnderTest(Profile* profile)
       : AutomaticProfileResetter(profile) {}
   virtual ~AutomaticProfileResetterUnderTest() {}
 
   MOCK_METHOD2(ReportStatistics, void(uint32, uint32));
+  MOCK_METHOD1(ReportPromptResult,
+      void(AutomaticProfileResetter::PromptResult));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutomaticProfileResetterUnderTest);
 };
 
 class MockProfileResetterDelegate : public AutomaticProfileResetterDelegate {
  public:
   MockProfileResetterDelegate()
       : emulated_default_search_provider_is_managed_(false) {}
   virtual ~MockProfileResetterDelegate() {}
 
   MOCK_METHOD0(EnumerateLoadedModulesIfNeeded, void());
   MOCK_CONST_METHOD1(RequestCallbackWhenLoadedModulesAreEnumerated,
                      void(const base::Closure&));
 
   MOCK_METHOD0(LoadTemplateURLServiceIfNeeded, void());
   MOCK_CONST_METHOD1(RequestCallbackWhenTemplateURLServiceIsLoaded,
                      void(const base::Closure&));
 
+  MOCK_METHOD0(FetchBrandcodedDefaultSettingsIfNeeded, void());
+  MOCK_CONST_METHOD1(RequestCallbackWhenBrandcodedDefaultsAreFetched,
+                     void(const base::Closure&));
+
   MOCK_CONST_METHOD0(OnGetLoadedModuleNameDigestsCalled, void());
   MOCK_CONST_METHOD0(OnGetDefaultSearchProviderDetailsCalled, void());
   MOCK_CONST_METHOD0(OnIsDefaultSearchProviderManagedCalled, void());
   MOCK_CONST_METHOD0(OnGetPrepopulatedSearchProvidersDetailsCalled, void());
 
-  MOCK_METHOD0(ShowPrompt, void());
+  MOCK_METHOD0(ShowPrompt, bool());
+  MOCK_METHOD2(TriggerProfileSettingsReset, void(bool, const base::Closure&));
+  MOCK_METHOD0(DismissPrompt, void());
 
   virtual scoped_ptr<base::ListValue>
       GetLoadedModuleNameDigests() const OVERRIDE {
     OnGetLoadedModuleNameDigestsCalled();
     return scoped_ptr<base::ListValue>(
         emulated_loaded_module_digests_.DeepCopy());
   }
 
   virtual scoped_ptr<base::DictionaryValue>
       GetDefaultSearchProviderDetails() const OVERRIDE {
@@ skipping 25 matching lines @@
         .WillOnce(Invoke(ClosureInvoker));
   }
 
   void ExpectCallsToGetterMethods() {
     EXPECT_CALL(*this, OnGetLoadedModuleNameDigestsCalled());
     EXPECT_CALL(*this, OnGetDefaultSearchProviderDetailsCalled());
     EXPECT_CALL(*this, OnIsDefaultSearchProviderManagedCalled());
     EXPECT_CALL(*this, OnGetPrepopulatedSearchProvidersDetailsCalled());
   }
 
+  void ExpectCallToShowPrompt() {
+    EXPECT_CALL(*this, ShowPrompt()).WillRepeatedly(testing::Return(true));
+    EXPECT_CALL(*this, FetchBrandcodedDefaultSettingsIfNeeded());
+  }
+
+  void ExpectCallToTriggerReset(bool send_feedback) {
+    EXPECT_CALL(*this, TriggerProfileSettingsReset(send_feedback, _))
+        .WillOnce(WithArgs<1>(Invoke(ClosureInvoker)));
+  }
+
   base::DictionaryValue& emulated_default_search_provider_details() {
     return emulated_default_search_provider_details_;
   }
 
   base::ListValue& emulated_search_providers_details() {
     return emulated_search_providers_details_;
   }
 
   base::ListValue& emulated_loaded_module_digests() {
     return emulated_loaded_module_digests_;
@@ skipping 268 matching lines @@
     // Register some additional local state preferences for testing purposes.
     PrefRegistrySimple* local_state_registry = local_state_.Get()->registry();
     DCHECK(local_state_registry);
     local_state_registry->RegisterStringPref(kTestPreferencePath, "");
 
     // Register some additional user preferences for testing purposes.
     user_prefs::PrefRegistrySyncable* user_prefs_registry =
         profile_->GetTestingPrefService()->registry();
     DCHECK(user_prefs_registry);
     user_prefs_registry->RegisterStringPref(
-        kTestPreferencePath,
-        "",
+        kTestPreferencePath, "",
         user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 
   virtual void SetUp() OVERRIDE {
     field_trials_.reset(new base::FieldTrialList(NULL));
     chrome_variations::testing::ClearAllVariationParams();
     base::FieldTrialList::CreateFieldTrial(kAutomaticProfileResetStudyName,
                                            experiment_group_name_);
     resetter_.reset(
         new testing::StrictMock<AutomaticProfileResetterUnderTest>(profile()));
@@ skipping 37 matching lines @@
     if (waiting_task_runner_->HasPendingTask()) {
       ASSERT_EQ(base::TimeDelta::FromSeconds(55),
                 waiting_task_runner_->NextPendingTaskDelay());
       waiting_task_runner_->RunPendingTasks();
     }
     base::RunLoop().RunUntilIdle();
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
     base::RunLoop().RunUntilIdle();
   }
 
+  void ShutdownResetter() {
+    resetter_->Shutdown();
+    resetter_.reset();
+  }
+
   TestingProfile* profile() { return profile_.get(); }
   TestingPrefServiceSimple* local_state() { return local_state_.Get(); }
 
   MockProfileResetterDelegate& mock_delegate() { return *mock_delegate_; }
   AutomaticProfileResetterUnderTest& resetter() { return *resetter_; }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_refptr<base::TestSimpleTaskRunner> waiting_task_runner_;
   ScopedTestingLocalState local_state_;
@@ skipping 31 matching lines @@
       : AutomaticProfileResetterTestBase(kStudyDisabledGroupName) {}
 };
 
 // Tests ---------------------------------------------------------------------
 
 TEST_F(AutomaticProfileResetterTestDisabled, NothingIsDoneWhenDisabled) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
-  EXPECT_EQ("", memento_in_prefs.ReadValue());
-  EXPECT_EQ("", memento_in_local_state.ReadValue());
-  EXPECT_EQ("", memento_in_file.ReadValue());
-
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   // No calls are expected to the delegate.
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTestDryRun, ConditionsNotSatisfied) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
-  EXPECT_EQ("", memento_in_prefs.ReadValue());
-  EXPECT_EQ("", memento_in_local_state.ReadValue());
-  EXPECT_EQ("", memento_in_file.ReadValue());
-
   SetTestingProgram(ConstructProgram(false, false));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x00u, 0x00u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTestDryRun, OneConditionSatisfied) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 
   SetTestingProgram(ConstructProgram(true, false));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x01u, 0x01u));
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_NOT_SHOWN));
 
   UnleashResetterAndWait();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
 }
 
 TEST_F(AutomaticProfileResetterTestDryRun, OtherConditionSatisfied) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 
   SetTestingProgram(ConstructProgram(false, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x02u, 0x01u));
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_NOT_SHOWN));
 
   UnleashResetterAndWait();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
 }
 
 #if defined(GOOGLE_CHROME_BUILD)
 TEST_F(AutomaticProfileResetterTestDryRun, ProgramSetThroughVariationParams) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
   AllowInjectingTestDataThroughVariationParams(true);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_NOT_SHOWN));
 
   UnleashResetterAndWait();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
 }
 #endif
 
 TEST_F(AutomaticProfileResetterTestDryRun,
        ConditionsSatisfiedAndInvalidMementos) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_prefs.StoreValue(kTestInvalidMementoValue);
   memento_in_local_state.StoreValue(kTestInvalidMementoValue);
   memento_in_file.StoreValue(kTestInvalidMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_NOT_SHOWN));
 
   UnleashResetterAndWait();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
 }
 
 TEST_F(AutomaticProfileResetterTestDryRun, AlreadyHadPrefHostedMemento) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_prefs.StoreValue(kTestMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x03u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTestDryRun, AlreadyHadLocalStateHostedMemento) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_local_state.StoreValue(kTestMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x05u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTestDryRun, AlreadyHadFileHostedMemento) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_file.StoreValue(kTestMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x09u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTestDryRun, DoNothingWhenResourcesAreMissing) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   SetTestingProgram("");
   SetTestingHashSeed("");
 
   // No calls are expected to the delegate.
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTest, ConditionsNotSatisfied) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
-  EXPECT_EQ("", memento_in_prefs.ReadValue());
-  EXPECT_EQ("", memento_in_local_state.ReadValue());
-  EXPECT_EQ("", memento_in_file.ReadValue());
-
   SetTestingProgram(ConstructProgram(false, false));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x00u, 0x00u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTest, OneConditionSatisfied) {
+  SetTestingProgram(ConstructProgram(true, false));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x01u, 0x01u));
+
+  UnleashResetterAndWait();
+}
+
+TEST_F(AutomaticProfileResetterTest, OtherConditionSatisfied) {
+  SetTestingProgram(ConstructProgram(false, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x02u, 0x01u));
+
+  UnleashResetterAndWait();
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptSuppressed) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
+
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+  ShutdownResetter();
+
+  EXPECT_EQ("", memento_in_prefs.ReadValue());
+  EXPECT_EQ("", memento_in_local_state.ReadValue());
+  EXPECT_EQ("", memento_in_file.ReadValue());
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptIgnored) {
+  PreferenceHostedPromptMemento memento_in_prefs(profile());
+  LocalStateHostedPromptMemento memento_in_local_state(profile());
+  FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 
-  SetTestingProgram(ConstructProgram(true, false));
+  SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
-  EXPECT_CALL(mock_delegate(), ShowPrompt());
-  EXPECT_CALL(resetter(), ReportStatistics(0x01u, 0x01u));
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_IGNORED));
 
   UnleashResetterAndWait();
+  resetter().NotifyDidShowResetBubble();
+  ShutdownResetter();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
 }
 
-TEST_F(AutomaticProfileResetterTest, OtherConditionSatisfied) {
+TEST_F(AutomaticProfileResetterTest, PromptActionReset) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 
-  SetTestingProgram(ConstructProgram(false, true));
-  SetTestingHashSeed(kTestHashSeed);
-
-  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
-  mock_delegate().ExpectCallsToGetterMethods();
-  EXPECT_CALL(mock_delegate(), ShowPrompt());
-  EXPECT_CALL(resetter(), ReportStatistics(0x02u, 0x01u));
-
-  UnleashResetterAndWait();
-
-  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
-  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
-  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+
+  testing::Mock::VerifyAndClearExpectations(&resetter());
+  testing::Mock::VerifyAndClearExpectations(&mock_delegate());
+
+  mock_delegate().ExpectCallToTriggerReset(false);
+  EXPECT_CALL(mock_delegate(), DismissPrompt());
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_ACTION_RESET));
+
+  resetter().NotifyDidShowResetBubble();
+  resetter().TriggerProfileReset(false /*send_feedback*/);
+
+  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptActionResetWithFeedback) {
+  PreferenceHostedPromptMemento memento_in_prefs(profile());
+  LocalStateHostedPromptMemento memento_in_local_state(profile());
+  FileHostedPromptMementoSynchronous memento_in_file(profile());
+
+  EXPECT_EQ("", memento_in_prefs.ReadValue());
+  EXPECT_EQ("", memento_in_local_state.ReadValue());
+  EXPECT_EQ("", memento_in_file.ReadValue());
+
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+
+  testing::Mock::VerifyAndClearExpectations(&resetter());
+  testing::Mock::VerifyAndClearExpectations(&mock_delegate());
+
+  mock_delegate().ExpectCallToTriggerReset(true);
+  EXPECT_CALL(mock_delegate(), DismissPrompt());
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_ACTION_RESET));
+
+  resetter().NotifyDidShowResetBubble();
+  resetter().TriggerProfileReset(true /*send_feedback*/);
+
+  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptActionNoReset) {
+  PreferenceHostedPromptMemento memento_in_prefs(profile());
+  LocalStateHostedPromptMemento memento_in_local_state(profile());
+  FileHostedPromptMementoSynchronous memento_in_file(profile());
+
+  EXPECT_EQ("", memento_in_prefs.ReadValue());
+  EXPECT_EQ("", memento_in_local_state.ReadValue());
+  EXPECT_EQ("", memento_in_file.ReadValue());
+
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+
+  testing::Mock::VerifyAndClearExpectations(&resetter());
+  testing::Mock::VerifyAndClearExpectations(&mock_delegate());
+
+  EXPECT_CALL(mock_delegate(), DismissPrompt());
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_ACTION_NO_RESET));
+
+  resetter().NotifyDidShowResetBubble();
+  resetter().SkipProfileReset();
+
+  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptFollowedByWebUIReset) {
+  PreferenceHostedPromptMemento memento_in_prefs(profile());
+  LocalStateHostedPromptMemento memento_in_local_state(profile());
+  FileHostedPromptMementoSynchronous memento_in_file(profile());
+
+  EXPECT_EQ("", memento_in_prefs.ReadValue());
+  EXPECT_EQ("", memento_in_local_state.ReadValue());
+  EXPECT_EQ("", memento_in_file.ReadValue());
+
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+
+  testing::Mock::VerifyAndClearExpectations(&resetter());
+  testing::Mock::VerifyAndClearExpectations(&mock_delegate());
+
+  EXPECT_CALL(mock_delegate(), DismissPrompt());
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_FOLLOWED_BY_WEBUI_RESET));
+
+  resetter().NotifyDidShowResetBubble();
+  resetter().NotifyDidOpenWebUIResetDialog();
+  resetter().NotifyDidCloseWebUIResetDialog(true);
+
+  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptFollowedByWebUINoReset) {
+  PreferenceHostedPromptMemento memento_in_prefs(profile());
+  LocalStateHostedPromptMemento memento_in_local_state(profile());
+  FileHostedPromptMementoSynchronous memento_in_file(profile());
+
+  EXPECT_EQ("", memento_in_prefs.ReadValue());
+  EXPECT_EQ("", memento_in_local_state.ReadValue());
+  EXPECT_EQ("", memento_in_file.ReadValue());
+
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+
+  testing::Mock::VerifyAndClearExpectations(&resetter());
+  testing::Mock::VerifyAndClearExpectations(&mock_delegate());
+
+  EXPECT_CALL(mock_delegate(), DismissPrompt());
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_FOLLOWED_BY_WEBUI_NO_RESET));
+
+  resetter().NotifyDidShowResetBubble();
+  resetter().NotifyDidOpenWebUIResetDialog();
+  resetter().NotifyDidCloseWebUIResetDialog(false);
+
+  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptSuppressedButHadWebUIReset) {
+  PreferenceHostedPromptMemento memento_in_prefs(profile());
+  LocalStateHostedPromptMemento memento_in_local_state(profile());
+  FileHostedPromptMementoSynchronous memento_in_file(profile());
+
+  EXPECT_EQ("", memento_in_prefs.ReadValue());
+  EXPECT_EQ("", memento_in_local_state.ReadValue());
+  EXPECT_EQ("", memento_in_file.ReadValue());
+
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+
+  testing::Mock::VerifyAndClearExpectations(&resetter());
+  testing::Mock::VerifyAndClearExpectations(&mock_delegate());
+
+  EXPECT_CALL(mock_delegate(), DismissPrompt());
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_SUPPRESSED_BUT_HAD_WEBUI_RESET));
+
+  resetter().NotifyDidOpenWebUIResetDialog();
+  resetter().NotifyDidCloseWebUIResetDialog(true);
+
+  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
+}
+
+TEST_F(AutomaticProfileResetterTest, PromptSuppressedButHadWebUINoReset) {
+  PreferenceHostedPromptMemento memento_in_prefs(profile());
+  LocalStateHostedPromptMemento memento_in_local_state(profile());
+  FileHostedPromptMementoSynchronous memento_in_file(profile());
+
+  EXPECT_EQ("", memento_in_prefs.ReadValue());
+  EXPECT_EQ("", memento_in_local_state.ReadValue());
+  EXPECT_EQ("", memento_in_file.ReadValue());
+
+  SetTestingProgram(ConstructProgram(true, true));
+  SetTestingHashSeed(kTestHashSeed);
+
+  mock_delegate().ExpectCallsToDependenciesSetUpMethods();
+  mock_delegate().ExpectCallsToGetterMethods();
+  mock_delegate().ExpectCallToShowPrompt();
+  EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+
+  UnleashResetterAndWait();
+
+  testing::Mock::VerifyAndClearExpectations(&resetter());
+  testing::Mock::VerifyAndClearExpectations(&mock_delegate());
+
+  EXPECT_CALL(mock_delegate(), DismissPrompt());
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_SUPPRESSED_BUT_HAD_WEBUI_NO_RESET));
+
+  resetter().NotifyDidOpenWebUIResetDialog();
+  resetter().NotifyDidCloseWebUIResetDialog(false);
+
+  EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
+  EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
+
+  ShutdownResetter();
 }
 
 #if defined(GOOGLE_CHROME_BUILD)
 TEST_F(AutomaticProfileResetterTest, ProgramSetThroughVariationParams) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
   AllowInjectingTestDataThroughVariationParams(true);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
-  EXPECT_CALL(mock_delegate(), ShowPrompt());
+  mock_delegate().ExpectCallToShowPrompt();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_IGNORED));
 
   UnleashResetterAndWait();
+  resetter().NotifyDidShowResetBubble();
+  ShutdownResetter();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
 }
 #endif
 
 TEST_F(AutomaticProfileResetterTest, ConditionsSatisfiedAndInvalidMementos) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_prefs.StoreValue(kTestInvalidMementoValue);
   memento_in_local_state.StoreValue(kTestInvalidMementoValue);
   memento_in_file.StoreValue(kTestInvalidMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
-  EXPECT_CALL(mock_delegate(), ShowPrompt());
+  mock_delegate().ExpectCallToShowPrompt();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x01u));
+  EXPECT_CALL(resetter(), ReportPromptResult(
+      AutomaticProfileResetter::PROMPT_IGNORED));
 
   UnleashResetterAndWait();
+  resetter().NotifyDidShowResetBubble();
+  ShutdownResetter();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTest, PrefHostedMementoPreventsPrompt) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_prefs.StoreValue(kTestMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x03u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ(kTestMementoValue, memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTest, LocalStateHostedMementoPreventsPrompt) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_local_state.StoreValue(kTestMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x05u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTest, FileHostedMementoPreventsPrompt) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   memento_in_file.StoreValue(kTestMementoValue);
 
   SetTestingProgram(ConstructProgram(true, true));
   SetTestingHashSeed(kTestHashSeed);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   EXPECT_CALL(resetter(), ReportStatistics(0x03u, 0x09u));
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ(kTestMementoValue, memento_in_file.ReadValue());
 }
 
 TEST_F(AutomaticProfileResetterTest, DoNothingWhenResourcesAreMissing) {
   PreferenceHostedPromptMemento memento_in_prefs(profile());
   LocalStateHostedPromptMemento memento_in_local_state(profile());
   FileHostedPromptMementoSynchronous memento_in_file(profile());
 
   SetTestingProgram("");
   SetTestingHashSeed("");
 
   // No calls are expected to the delegate.
 
   UnleashResetterAndWait();
+  ShutdownResetter();
 
   EXPECT_EQ("", memento_in_prefs.ReadValue());
   EXPECT_EQ("", memento_in_local_state.ReadValue());
   EXPECT_EQ("", memento_in_file.ReadValue());
 }
 
 // Please see comments above ConstructProgramToCheckPreferences() to understand
 // how the following tests work.
 
 TEST_F(AutomaticProfileResetterTest, InputUserPreferencesCorrect) {
   SetTestingProgram(ConstructProgramToCheckPreferences());
   SetTestingHashSeed(kTestHashSeed);
 
   PrefService* prefs = profile()->GetPrefs();
   prefs->SetString(kTestPreferencePath, kTestPreferenceValue);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
-  uint32 expected_mask =
-      HAS_EXPECTED_USER_PREFERENCE | USER_PREFERENCE_IS_USER_CONTROLLED;
+  uint32 expected_mask = HAS_EXPECTED_USER_PREFERENCE |
+                         USER_PREFERENCE_IS_USER_CONTROLLED;
   EXPECT_CALL(resetter(), ReportStatistics(0x00u, expected_mask));
 
   UnleashResetterAndWait();
 }
 
 TEST_F(AutomaticProfileResetterTest, InputLocalStateCorrect) {
   SetTestingProgram(ConstructProgramToCheckPreferences());
   SetTestingHashSeed(kTestHashSeed);
 
   PrefService* prefs = local_state();
   prefs->SetString(kTestPreferencePath, kTestPreferenceValue);
 
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
-  uint32 expected_mask =
-      HAS_EXPECTED_LOCAL_STATE_PREFERENCE | LOCAL_STATE_IS_USER_CONTROLLED;
+  uint32 expected_mask = HAS_EXPECTED_LOCAL_STATE_PREFERENCE |
+                         LOCAL_STATE_IS_USER_CONTROLLED;
   EXPECT_CALL(resetter(), ReportStatistics(0x00u, expected_mask));
 
   UnleashResetterAndWait();
 }
 
 TEST_F(AutomaticProfileResetterTest, InputManagedUserPreferencesCorrect) {
   SetTestingProgram(ConstructProgramToCheckPreferences());
   SetTestingHashSeed(kTestHashSeed);
 
   TestingPrefServiceSyncable* prefs = profile()->GetTestingPrefService();
@@ skipping 95 matching lines @@
   mock_delegate().ExpectCallsToDependenciesSetUpMethods();
   mock_delegate().ExpectCallsToGetterMethods();
   uint32 expected_mask =
       HAS_EXPECTED_MODULE_DIGEST_1 | HAS_EXPECTED_MODULE_DIGEST_2;
   EXPECT_CALL(resetter(), ReportStatistics(0x00u, expected_mask));
 
   UnleashResetterAndWait();
 }
 
 }  // namespace