chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm - Issue 10534093: TabContentsWrapper -> TabContents, part 37.

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/tabs/tab_strip_controller_unittest.mm

Issue 10534093: TabContentsWrapper -> TabContents, part 37. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm

index 207476b82ad872b3421e304f9deabb1262c11365..5fdd399b07b515ed7da2e2fdee15bfc27e2c0fa4 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm

@@ -13,7 +13,7 @@

#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"

#import "chrome/browser/ui/cocoa/tabs/tab_view.h"

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

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

#include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"

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

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

@@ -117,7 +117,7 @@ class TabStripControllerTest : public CocoaProfileTest {

TEST_F(TabStripControllerTest, AddRemoveTabs) {

EXPECT_TRUE(model_->empty());

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

- TabContentsWrapper* tab_contents =

+ TabContents* tab_contents =

Browser::TabContentsFactory(profile(), instance,

MSG_ROUTING_NONE, NULL, NULL);

model_->AppendTabContents(tab_contents, true);

@@ -135,16 +135,16 @@ TEST_F(TabStripControllerTest, RearrangeTabs) {

TEST_F(TabStripControllerTest, CorrectToolTipText) {

// Create tab 1.

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

- TabContentsWrapper* tab_contents =

- Browser::TabContentsFactory(profile(), instance,

- MSG_ROUTING_NONE, NULL, NULL);

+ TabContents* tab_contents =

+ Browser::TabContentsFactory(profile(), instance,

+ MSG_ROUTING_NONE, NULL, NULL);

model_->AppendTabContents(tab_contents, true);

// Create tab 2.

SiteInstance* instance2 = SiteInstance::Create(profile());

- TabContentsWrapper* tab_contents2 =

- Browser::TabContentsFactory(profile(), instance2,

- MSG_ROUTING_NONE, NULL, NULL);

+ TabContents* tab_contents2 =

+ Browser::TabContentsFactory(profile(), instance2,

+ MSG_ROUTING_NONE, NULL, NULL);

model_->AppendTabContents(tab_contents2, true);

// Set tab 1 tooltip.