Chromium Code Reviews| Index: chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
| diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
| index 0e0d2a86c446c5e241a978c3104a2159173476bd..09c3b076ca922ab544caabc38dcc24a6f77585d0 100644 |
| --- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
| +++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
| @@ -60,6 +60,7 @@ |
| #include "net/url_request/test_url_fetcher_factory.h" |
| #include "net/url_request/url_fetcher_delegate.h" |
| #include "net/url_request/url_request_status.h" |
| +#include "net/url_request/url_request_test_util.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| #include "third_party/WebKit/public/web/WebContextMenuData.h" |
| #include "url/gurl.h" |
| @@ -454,17 +455,19 @@ class TranslateManagerRenderViewHostTest |
| protected: |
| virtual void SetUp() { |
| - TranslateService::InitializeForTesting(); |
| + ChromeRenderViewHostTestHarness::SetUp(); |
|
groby-ooo-7-16
2017/04/24 19:12:46
Why is the order of RVHTest setup and TranslateSer
Roger McFarlane (Chromium)
2017/04/24 20:31:34
RVHTest setup sets up the threading and message lo
|
| // Clears the translate script so it is fetched everytime and sets the |
| // expiration delay to a large value by default (in case it was zeroed in a |
| // previous test). |
| + TranslateService::InitializeForTesting(); |
| translate::TranslateDownloadManager* download_manager = |
| translate::TranslateDownloadManager::GetInstance(); |
| download_manager->ClearTranslateScriptForTesting(); |
| download_manager->SetTranslateScriptExpirationDelay(60 * 60 * 1000); |
| + download_manager->set_request_context(new net::TestURLRequestContextGetter( |
| + base::ThreadTaskRunnerHandle::Get())); |
| - ChromeRenderViewHostTestHarness::SetUp(); |
| InfoBarService::CreateForWebContents(web_contents()); |
| ChromeTranslateClient::CreateForWebContents(web_contents()); |
| ChromeTranslateClient::FromWebContents(web_contents()) |