chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc - Issue 10542010: TabContentsWrapper -> TabContents, part 2.

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 10542010: TabContentsWrapper -> TabContents, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, rename Created 8 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 40ebf4c8e6cfd5c1bc5285a9ab1759fbbe40a8d8..85dc7e2ae8dd2527f231ea6534ba996973ef263b 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

@@ -8,7 +8,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/content_settings/content_setting_image_model.h"

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

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

+#include "chrome/browser/ui/tab_contents/test_tab_contents.h"

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

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

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

@@ -17,7 +17,7 @@

using content::BrowserThread;

-class ContentSettingImageModelTest : public TabContentsWrapperTestHarness {

+class ContentSettingImageModelTest : public TabContentsTestHarness {

public:

ContentSettingImageModelTest()

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

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

TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) {

TabSpecificContentSettings* content_settings =

- contents_wrapper()->content_settings();

+ tab_contents()->content_settings();

scoped_ptr<ContentSettingImageModel> content_setting_image_model(

ContentSettingImageModel::CreateContentSettingImageModel(

CONTENT_SETTINGS_TYPE_IMAGES));

@@ -49,7 +49,7 @@ TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) {

TEST_F(ContentSettingImageModelTest, CookieAccessed) {

TabSpecificContentSettings* content_settings =

- contents_wrapper()->content_settings();

+ tab_contents()->content_settings();

profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(

CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK);

scoped_ptr<ContentSettingImageModel> content_setting_image_model(