content/browser/web_contents/render_view_host_manager_unittest.cc - Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

Unified Diff: content/browser/web_contents/render_view_host_manager_unittest.cc

Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address jyasskin's comments\ Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/activity_log/activity_database_unittest.cc ('K') | « content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc ('k') | content/browser/web_contents/web_contents_delegate_unittest.cc » ('j') | content/public/test/test_renderer_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/render_view_host_manager_unittest.cc

diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc

index dc6c814f2c2abf6d54d344da6cec895e9ee71885..98107b67af53aaba5a97b563b641f9e30ec0e8a2 100644

--- a/content/browser/web_contents/render_view_host_manager_unittest.cc

+++ b/content/browser/web_contents/render_view_host_manager_unittest.cc

@@ -3,7 +3,6 @@

// found in the LICENSE file.

#include "base/utf_string_conversions.h"

-#include "content/browser/browser_thread_impl.h"

#include "content/browser/renderer_host/test_render_view_host.h"

#include "content/browser/site_instance_impl.h"

#include "content/browser/web_contents/navigation_controller_impl.h"

@@ -21,7 +20,6 @@

#include "content/public/common/url_constants.h"

#include "content/public/common/url_utils.h"

#include "content/public/test/mock_render_process_host.h"

-#include "content/public/test/test_browser_context.h"

#include "content/public/test/test_notification_tracker.h"

#include "content/test/test_content_browser_client.h"

#include "content/test/test_content_client.h"

@@ -131,7 +129,6 @@ class RenderViewHostManagerTest

// a regression test for bug 9364.

TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {

set_should_create_webui(true);

- BrowserThreadImpl ui_thread(BrowserThread::UI, base::MessageLoop::current());

const GURL kChromeUrl("chrome://foo");

const GURL kDestUrl("http://www.google.com/");

@@ -196,7 +193,6 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {

// for synchronous messages, which cannot be ignored without leaving the

// renderer in a stuck state. See http://crbug.com/93427.

TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) {

- BrowserThreadImpl ui_thread(BrowserThread::UI, base::MessageLoop::current());

const GURL kChromeURL("chrome://foo");

const GURL kDestUrl("http://www.google.com/");

@@ -273,7 +269,6 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) {

// EnableViewSourceMode message is sent on every navigation regardless

// RenderView is being newly created or reused.

TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) {

- BrowserThreadImpl ui_thread(BrowserThread::UI, base::MessageLoop::current());

const GURL kChromeUrl("chrome://foo");

const GURL kUrl("view-source:http://foo");

@@ -592,7 +587,6 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {

// Tests WebUI creation.

TEST_F(RenderViewHostManagerTest, WebUI) {

set_should_create_webui(true);

- BrowserThreadImpl ui_thread(BrowserThread::UI, base::MessageLoop::current());

SiteInstance* instance = SiteInstance::Create(browser_context());

scoped_ptr<TestWebContents> web_contents(