Tests that use TranslateDownLoaderManager::set_url_loader_factory should clear it

... to avoid leaking it to other tests, which may want to test the non-fetch
behavior, or have things set up for that to be usable. ResetForTesting
was adjusted to take care of that, which seems sensible.


Bug: 852929
Change-Id: I84147090a80836e0296d011b966b153aa4a30543
Reviewed-on: https://chromium-review.googlesource.com/1102723Reviewed-by: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Michael Martis <martis@chromium.org>
Commit-Queue: Maks Orlovich <morlovich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569437}

components/translate/core/browser/translate_download_manager.cc

@@ -74,6 +74,7 @@ void TranslateDownloadManager::ResetForTesting() {
   DCHECK(sequence_checker_.CalledOnValidSequence());
   language_list_.reset(new TranslateLanguageList);
   script_.reset(new TranslateScript);
+  url_loader_factory_ = nullptr;
 }
 
 void TranslateDownloadManager::SetTranslateScriptExpirationDelay(int delay_ms) {

components/translate/core/browser/translate_language_list_unittest.cc

@@ -160,6 +160,8 @@ TEST(TranslateLanguageListTest, GetSupportedLanguagesFetch) {
   languages.clear();
   language_list.GetSupportedLanguages(true /* translate_allowed */, &languages);
   EXPECT_EQ(std::vector<std::string>(1, "it"), languages);
+
+  TranslateDownloadManager::GetInstance()->ResetForTesting();
 }
 
 // Check that we don't send any network data when translate is disabled by
@@ -186,6 +188,8 @@ TEST(TranslateLanguageListTest, GetSupportedLanguagesNoFetch) {
   // language list load.
   EXPECT_FALSE(language_list.HasOngoingLanguageListLoadingForTesting());
   EXPECT_TRUE(test_url_loader_factory.pending_requests()->empty());
+
+  TranslateDownloadManager::GetInstance()->ResetForTesting();
 }
 
 }  // namespace translate

components/translate/core/browser/translate_manager_unittest.cc

@@ -432,20 +432,8 @@ TEST_F(TranslateManagerTest,
       1);
 }
 
-#if defined(OS_IOS)
-#if TARGET_OS_SIMULATOR
-#define MAYBE_OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt \
-  OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt
-#else  // !TARGET_OS_SIMULATOR
-#define MAYBE_OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt \
-  DISABLED_OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt
-#endif  // TARGET_OS_SIMULATOR
-#else   // !defined(OS_IOS)
-#define MAYBE_OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt \
-  OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt
-#endif  // defined(OS_IOS)
 TEST_F(TranslateManagerTest,
-       MAYBE_OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt) {
+       OverrideTriggerWithIndiaEnglishExperimentAcceptPrompt) {
   manager_->set_application_locale("en");
   scoped_feature_list_.InitAndEnableFeatureWithParameters(
       language::kOverrideTranslateTriggerInIndia,

components/translate/core/browser/translate_script_unittest.cc

@@ -40,7 +40,10 @@ class TranslateScriptTest : public testing::Test {
         test_shared_loader_factory_);
   }
 
-  void TearDown() override { script_.reset(); }
+  void TearDown() override {
+    script_.reset();
+    TranslateDownloadManager::GetInstance()->ResetForTesting();
+  }
 
   void Request() {
     script_->Request(