chrome/browser/ui/cocoa/infobars/infobar_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/infobars/infobar_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/infobars/infobar_controller.mm ('k') | chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm

index 6b66e00c8276bc64435de465a60403e29178e2e8..32a46021d262b21e05512411a50615bb0a815a24 100644

--- a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm

@@ -15,7 +15,7 @@

#include "chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h"

#include "chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h"

#include "chrome/browser/ui/cocoa/run_loop_testing.h"

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

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

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

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

#include "testing/platform_test.h"

@@ -99,7 +99,7 @@ class LinkInfoBarControllerTest : public CocoaProfileTest,

public:

virtual void SetUp() {

CocoaProfileTest::SetUp();

- tab_contents_.reset(new TabContentsWrapper(WebContents::Create(

+ tab_contents_.reset(new TabContents(WebContents::Create(

profile(), NULL, MSG_ROUTING_NONE, NULL, NULL)));

tab_contents_->infobar_tab_helper()->set_infobars_enabled(false);

@@ -135,7 +135,7 @@ class LinkInfoBarControllerTest : public CocoaProfileTest,

delegate_ = NULL;

}

- scoped_ptr<TabContentsWrapper> tab_contents_;

+ scoped_ptr<TabContents> tab_contents_;

};

class ConfirmInfoBarControllerTest : public CocoaProfileTest,

@@ -143,7 +143,7 @@ class ConfirmInfoBarControllerTest : public CocoaProfileTest,