Commit 56964ea9 authored by Eric Seckler's avatar Eric Seckler Committed by Commit Bot

chrome: Prepare browser tests for PostTask refactor.

Updates prerender and safe browsing browser tests to initialize the
SafeBrowsingDatabaseManager after BrowserThreads were created (but
before they are started). This is required for the upcoming move of
BrowserThread::PostTask to base/task/post_task.h, as construction of
SafeBrowsingDatabaseManager obtains a TaskRunner for the IO thread.
In the future, this has to happen after thread initialization.

Bug: 878356
Change-Id: I1d4c614690ba3aacf4887fefe57d378c23668706
Reviewed-on: https://chromium-review.googlesource.com/1211735Reviewed-by: default avatarJialiu Lin <jialiul@chromium.org>
Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589488}
parent d1b784de
......@@ -629,7 +629,8 @@ PrerenderInProcessBrowserTest::GetFakeSafeBrowsingDatabaseManager() {
.get());
}
void PrerenderInProcessBrowserTest::SetUpInProcessBrowserTestFixture() {
void PrerenderInProcessBrowserTest::CreatedBrowserMainParts(
content::BrowserMainParts* browser_main_parts) {
safe_browsing_factory_->SetTestDatabaseManager(
new test_utils::FakeSafeBrowsingDatabaseManager());
safe_browsing::SafeBrowsingService::RegisterFactory(
......
......@@ -311,7 +311,8 @@ class PrerenderInProcessBrowserTest : virtual public InProcessBrowserTest {
~PrerenderInProcessBrowserTest() override;
void SetUpCommandLine(base::CommandLine* command_line) override;
void SetUpInProcessBrowserTestFixture() override;
void CreatedBrowserMainParts(
content::BrowserMainParts* browser_main_parts) override;
void TearDownInProcessBrowserTestFixture() override;
void SetUpOnMainThread() override;
content::SessionStorageNamespace* GetSessionStorageNamespace() const;
......
......@@ -366,15 +366,15 @@ class SafeBrowsingBlockingPageBrowserTest
~SafeBrowsingBlockingPageBrowserTest() override {}
void SetUp() override {
void CreatedBrowserMainParts(
content::BrowserMainParts* browser_main_parts) override {
// Test UI manager and test database manager should be set before
// InProcessBrowserTest::SetUp().
// the browser is started but after threads are created.
factory_.SetTestUIManager(new FakeSafeBrowsingUIManager());
factory_.SetTestDatabaseManager(new FakeSafeBrowsingDatabaseManager());
SafeBrowsingService::RegisterFactory(&factory_);
SafeBrowsingBlockingPage::RegisterFactory(&blocking_page_factory_);
ThreatDetails::RegisterFactory(&details_factory_);
InProcessBrowserTest::SetUp();
}
void TearDown() override {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment