chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc - Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model_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: merged ToT Created 7 years, 6 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

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/ui/find_bar/find_backend_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

index bafce3b9548fdb746e629897d92c3497b5075fa5..97256a3cb8606adc2be5a904ab2084af4b2e2880 100644

--- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

@@ -14,7 +14,6 @@

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

#include "content/public/browser/notification_service.h"

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

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

#include "net/cookies/cookie_options.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -54,14 +53,6 @@ class NotificationForwarder : public content::NotificationObserver {

};

class ContentSettingImageModelTest : public ChromeRenderViewHostTestHarness {

- public:

- ContentSettingImageModelTest()

- : ui_thread_(content::BrowserThread::UI, &message_loop_) {}

- private:

- content::TestBrowserThread ui_thread_;

- DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModelTest);

};

TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) {