Settings reset prompt: add startup logic

chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc

 // Copyright 2017 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 <algorithm>
 #include <initializer_list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 72 matching lines @@
     if (params.setting_to_reset == SettingType::STARTUP_PAGE)
       startup_urls_to_reset_ = startup_urls_;
 
     for (size_t i = 0; i < params.extensions_to_disable; ++i) {
       std::string id = "id" + base::IntToString(i);
       extensions_.insert(
           std::make_pair(id, safe_browsing::ExtensionInfo(
                                  id, "Extension " + base::IntToString(i))));
     }
 
+    ON_CALL(*this, ShouldPromptForReset()).WillByDefault(Return(true));
     ON_CALL(*this, PerformReset(_)).WillByDefault(Return());
-
-    ON_CALL(*this, ShouldPromptForReset()).WillByDefault(Return(true));
+    ON_CALL(*this, DialogShown()).WillByDefault(Return());
 
     ON_CALL(*this, homepage()).WillByDefault(Return(GURL(kHomepageUrl)));
     ON_CALL(*this, homepage_reset_state())
         .WillByDefault(
             Return(params.setting_to_reset == SettingType::HOMEPAGE
                        ? RESET_REQUIRED
                        : NO_RESET_REQUIRED_DUE_TO_DOMAIN_NOT_MATCHED));
 
     ON_CALL(*this, default_search()).WillByDefault(Return(GURL(kSearchUrl)));
     ON_CALL(*this, default_search_reset_state())
@@ skipping 11 matching lines @@
                        ? RESET_REQUIRED
                        : NO_RESET_REQUIRED_DUE_TO_DOMAIN_NOT_MATCHED));
 
     ON_CALL(*this, extensions_to_disable())
         .WillByDefault(ReturnRef(extensions_));
   }
   ~MockSettingsResetPromptModel() override {}
 
   MOCK_METHOD1(PerformReset, void(const base::Closure&));
   MOCK_CONST_METHOD0(ShouldPromptForReset, bool());
+  MOCK_METHOD0(DialogShown, void());
   MOCK_CONST_METHOD0(homepage, GURL());
   MOCK_CONST_METHOD0(homepage_reset_state, ResetState());
   MOCK_CONST_METHOD0(default_search, GURL());
   MOCK_CONST_METHOD0(default_search_reset_state, ResetState());
   MOCK_CONST_METHOD0(startup_urls, const std::vector<GURL>&());
   MOCK_CONST_METHOD0(startup_urls_to_reset, const std::vector<GURL>&());
   MOCK_CONST_METHOD0(startup_urls_reset_state, ResetState());
   MOCK_CONST_METHOD0(extensions_to_disable, const ExtensionMap&());
 
  private:
@@ skipping 63 matching lines @@
   RunDialog();
 }
 IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_sp2_ext2) {
   RunDialog();
 }
 IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_hp_ext2) {
   RunDialog();
 }
 
 }  // namespace