Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6987)

Unified Diff: chrome/browser/ui/intents/web_intent_inline_disposition_delegate_unittest.cc

Issue 10542105: TabContentsWrapper -> TabContents, part 42. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: chrome/browser/ui/intents/web_intent_inline_disposition_delegate_unittest.cc
diff --git a/chrome/browser/ui/intents/web_intent_inline_disposition_delegate_unittest.cc b/chrome/browser/ui/intents/web_intent_inline_disposition_delegate_unittest.cc
index a35497315f91f18ccc1b8089ba142263c823a00b..02de994f26eb813cfe2ee588abb998264043f707 100644
--- a/chrome/browser/ui/intents/web_intent_inline_disposition_delegate_unittest.cc
+++ b/chrome/browser/ui/intents/web_intent_inline_disposition_delegate_unittest.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"
#include "chrome/browser/ui/intents/web_intent_picker.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/web_contents.h"
@@ -27,14 +27,14 @@ class WebIntentInlineDispositionBrowserTest
content::WebContents* contents = content::WebContents::Create(
browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
- wrapper_.reset(new TabContentsWrapper(contents));
+ tab_contents_.reset(new TabContents(contents));
delegate_.reset(new WebIntentInlineDispositionDelegate(&mock_,
contents, browser()->profile()));
}
protected:
TestingProfile profile_;
- scoped_ptr<TabContentsWrapper> wrapper_;
+ scoped_ptr<TabContents> tab_contents_;
scoped_ptr<WebIntentInlineDispositionDelegate> delegate_;
WebIntentPickerMock mock_;
};
@@ -43,11 +43,11 @@ class WebIntentInlineDispositionBrowserTest
// web intents picker.
TEST_F(WebIntentInlineDispositionBrowserTest, OpenURLFromTabTest) {
content::WebContents* source = delegate_->OpenURLFromTab(
- wrapper_->web_contents(),
+ tab_contents_->web_contents(),
content::OpenURLParams(GURL(chrome::kAboutBlankURL), content::Referrer(),
NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
// Ensure OpenURLFromTab loaded about::blank in |web_contents_|.
- ASSERT_EQ(wrapper_->web_contents(), source);
+ ASSERT_EQ(tab_contents_->web_contents(), source);
EXPECT_EQ(GURL(chrome::kAboutBlankURL).spec(), source->GetURL().spec());
}
« no previous file with comments | « chrome/browser/ui/cocoa/web_intent_sheet_controller.h ('k') | chrome/browser/ui/intents/web_intent_picker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698