Settings reset prompt: add startup logic

chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc

Index: chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc
similarity index 95%
rename from chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest.cc
rename to chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc
index c76d9f725045799018378ae2ef1c258c275474cf..aab9ca18cd3be6d57a28c345bdc80fb26c76ee11 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc
@@ -51,20 +51,12 @@ const char kDefaultSearchUrl[] = "http://mygoogle.com/s?q={searchTerms}";
 const char kDefaultStartupUrl1[] = "http://mystart1.com";
 const char kDefaultStartupUrl2[] = "http://mystart2.com";
 
-// Some tests and parts of tests should only be run on platforms where settings
-// override for extensions is available. The settings reset prompt is currently
-// designed for desktop, and Windows in particular. Getting the tests to run on
-// other platforms that do not allow extensions to override settings (e.g.,
-// Linux) would require more #ifdefs and platform specific considerations than
-// it is worth.
-#if defined(OS_WIN) || defined(OS_MACOSX)
 const char kHomepage1[] = "http://homepage.com/";
 const char kHomepage2[] = "http://otherhomepage.com/";
 const char kSearchUrl1[] = "http://mysearch.com/s?q={searchTerms}";
 const char kSearchUrl2[] = "http://othersearch.com/s?q={searchTerms}";
 const char kStartupUrl1[] = "http://super-startup.com";
 const char kStartupUrl2[] = "http://awesome-start-page.com";
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 // Extension manifests to override settings.
 const char kManifestNoOverride[] =
@@ -256,9 +248,6 @@ IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
     EXPECT_THAT(model->extensions_to_disable(), IsEmpty());
   }
 
-// Some tests should run only on platforms where settings override for
-// extensions is available. See comment at the top for more details.
-#if defined(OS_WIN) || defined(OS_MACOSX)
   // Load extension that overrides homepage. Homepage no longer needs to be
   // reset.
   const Extension* homepage_extension1 = nullptr;
@@ -315,7 +304,6 @@ IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
                 UnorderedElementsAre(Pair(homepage_extension1->id(), _),
                                      Pair(homepage_extension2->id(), _)));
   }
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)
 }
 
 IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
@@ -349,9 +337,6 @@ IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
     EXPECT_THAT(model->extensions_to_disable(), IsEmpty());
   }
 
-// Some tests should run only on platforms where settings override for
-// extensions is available. See comment at the top for more details.
-#if defined(OS_WIN) || defined(OS_MACOSX)
   // Load extension that overrides search. Search no longer needs to be reset.
   const Extension* search_extension1 = nullptr;
   LoadSearchExtension(kSearchUrl1, &search_extension1);
@@ -407,7 +392,6 @@ IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
                 UnorderedElementsAre(Pair(search_extension1->id(), _),
                                      Pair(search_extension2->id(), _)));
   }
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)
 }
 
 IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
@@ -454,9 +438,6 @@ IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
     EXPECT_THAT(model->extensions_to_disable(), IsEmpty());
   }
 
-// Some tests should run only on platforms where settings override for
-// extensions is available. See comment at the top for more details.
-#if defined(OS_WIN) || defined(OS_MACOSX)
   // Load two other extensions that each override startup urls.
   const Extension* startup_url_extension1 = nullptr;
   LoadStartupUrlExtension(kStartupUrl1, &startup_url_extension1);
@@ -515,12 +496,8 @@ IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
                 UnorderedElementsAre(Pair(startup_url_extension1->id(), _),
                                      Pair(startup_url_extension2->id(), _)));
   }
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)
 }
 
-// Some tests should run only on platforms where settings override for
-// extensions is available. See comment at the top for more details.
-#if defined(OS_WIN) || defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(SettingsResetPromptModelBrowserTest,
                        PerformReset_DefaultSearch) {
   // Load an extension that does not override settings and two extensions that
@@ -789,7 +766,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionSettingsOverrideTest, ExtensionsToDisable) {
 INSTANTIATE_TEST_CASE_P(SettingsResetPromptModel,
                         ExtensionSettingsOverrideTest,
                         Combine(Bool(), Bool(), Bool()));
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace
 }  // namespace safe_browsing