chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc - Issue 8392042: Split BrowserThread into public API and private implementation, step 1.

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 8392042: Split BrowserThread into public API and private implementation, step 1. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 9 years, 2 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/crypto_module_password_dialog_nss.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 e2c50a92eebf86cc38937b0d5d5406b6592018c7..2709148fa57471b5359b4564e7767be940705f53 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

@@ -10,9 +10,9 @@

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"

#include "chrome/test/base/testing_profile.h"

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

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

#include "content/browser/tab_contents/test_tab_contents.h"

+#include "content/test/test_browser_thread.h"

#include "net/base/cookie_options.h"

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

@@ -22,7 +22,7 @@ class ContentSettingImageModelTest : public TabContentsWrapperTestHarness {

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

private:

- BrowserThread ui_thread_;

+ content::TestBrowserThread ui_thread_;

DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModelTest);

};