diff --git a/chromium_src/components/translate/core/browser/translate_language_list.h b/chromium_src/components/translate/core/browser/translate_language_list.h index 484be8c356b..6d505dd5ee6 100644 --- a/chromium_src/components/translate/core/browser/translate_language_list.h +++ b/chromium_src/components/translate/core/browser/translate_language_list.h @@ -16,6 +16,7 @@ namespace translate { class TranslateLanguageList : public TranslateLanguageList_ChromiumImpl { public: + using TranslateLanguageList_ChromiumImpl::TranslateLanguageList_ChromiumImpl; void SetResourceRequestsAllowed(bool allowed) override; }; diff --git a/chromium_src/components/translate/core/browser/translate_manager_unittest.cc b/chromium_src/components/translate/core/browser/translate_manager_unittest.cc index 7a1d9f3c00c..d072226c351 100644 --- a/chromium_src/components/translate/core/browser/translate_manager_unittest.cc +++ b/chromium_src/components/translate/core/browser/translate_manager_unittest.cc @@ -25,6 +25,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_pref_names.h" #include "components/translate/core/browser/translate_prefs.h" +#include "components/translate/core/browser/translate_url_fetcher.h" #include "components/translate/core/common/translate_constants.h" #include "components/variations/variations_associated_data.h" #include "google_apis/google_api_keys.h" @@ -77,6 +78,18 @@ class TestNetworkChangeNotifier { std::unique_ptr mock_notifier_; }; +class DummyTranslateUrlFetcher : public translate::TranslateUrlFetcher { + public: + DummyTranslateUrlFetcher() = default; + ~DummyTranslateUrlFetcher() override = default; + + bool Request(const GURL& url, Callback callback, bool is_incognito) override { + return true; + } + + State state() const override { return IDLE; } +}; + // A language model that just returns its instance variable. class MockLanguageModel : public language::LanguageModel { public: @@ -119,10 +132,11 @@ class TranslateManagerTest : public ::testing::Test { mock_language_model_({MockLanguageModel::LanguageDetails("en", 1.0)}) {} void SetUp() override { - // Ensure we're not requesting a server-side translate language list. - TranslateLanguageList::DisableUpdate(); - manager_->ResetForTesting(); + + // Ensure we're not requesting a server-side translate language list. + manager_->set_language_list(std::make_unique( + std::make_unique())); } void TearDown() override {