chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm - 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/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

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/cocoa/content_settings/collected_cookies_mac_unittest.mm ('k') | chrome/browser/ui/cocoa/tab_contents/favicon_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

index 9cefac56cd197f477853e010f2f904931615762b..0cd17a6f09a62e58a5688a68d2fbb94e672344e8 100644

--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

@@ -11,7 +11,7 @@

#include "base/memory/scoped_nsobject.h"

#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

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

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

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

#include "chrome/common/content_settings_types.h"

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

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

@@ -35,7 +35,7 @@ class DummyContentSettingBubbleModel : public ContentSettingBubbleModel {

};

class ContentSettingBubbleControllerTest

- : public TabContentsWrapperTestHarness {

+ : public TabContentsTestHarness {

public:

ContentSettingBubbleControllerTest();

virtual ~ContentSettingBubbleControllerTest();

@@ -47,7 +47,7 @@ class ContentSettingBubbleControllerTest

};

ContentSettingBubbleControllerTest::ContentSettingBubbleControllerTest()

- : TabContentsWrapperTestHarness(),

+ : TabContentsTestHarness(),

browser_thread_(BrowserThread::UI, &message_loop_) {

}

@@ -80,7 +80,7 @@ TEST_F(ContentSettingBubbleControllerTest, Init) {

[parent.get() orderBack:nil];

ContentSettingBubbleController* controller = [ContentSettingBubbleController

- showForModel:new DummyContentSettingBubbleModel(contents_wrapper(),

+ showForModel:new DummyContentSettingBubbleModel(tab_contents(),

profile(),

settingsType)

parentWindow:parent