summaryrefslogtreecommitdiffstats
path: root/chrome/browser/intents
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 14:22:42 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 14:22:42 +0000
commit0502e1fe578631d0c7241ec1c500139ca8a9eda7 (patch)
tree3fed85b3eab0e730bb162e3e99bd3a119d6492aa /chrome/browser/intents
parentc6103d870dd28a1bf6ebd0a693cf635a0ccfcae7 (diff)
downloadchromium_src-0502e1fe578631d0c7241ec1c500139ca8a9eda7.zip
chromium_src-0502e1fe578631d0c7241ec1c500139ca8a9eda7.tar.gz
chromium_src-0502e1fe578631d0c7241ec1c500139ca8a9eda7.tar.bz2
TabContentsWrapper -> TabContents, part 2.
BUG=131026 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10542010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/intents')
-rw-r--r--chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
index 0bd1c8c..9e4f8f2 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/intents/web_intents_registry.h"
#include "chrome/browser/intents/web_intents_registry_factory.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 "testing/gmock/include/gmock/gmock.h"
@@ -36,14 +36,14 @@ MockWebIntentsRegistry* BuildForProfile(Profile* profile) {
}
class RegisterIntentHandlerInfoBarDelegateTest
- : public TabContentsWrapperTestHarness {
+ : public TabContentsTestHarness {
protected:
RegisterIntentHandlerInfoBarDelegateTest()
: ui_thread_(BrowserThread::UI, MessageLoopForUI::current()),
db_thread_(BrowserThread::DB, MessageLoopForUI::current()) {}
virtual void SetUp() {
- TabContentsWrapperTestHarness::SetUp();
+ TabContentsTestHarness::SetUp();
profile()->CreateWebDataService();
web_intents_registry_ = BuildForProfile(profile());
@@ -52,7 +52,7 @@ class RegisterIntentHandlerInfoBarDelegateTest
virtual void TearDown() {
web_intents_registry_ = NULL;
- TabContentsWrapperTestHarness::TearDown();
+ TabContentsTestHarness::TearDown();
}
MockWebIntentsRegistry* web_intents_registry_;
@@ -70,7 +70,7 @@ TEST_F(RegisterIntentHandlerInfoBarDelegateTest, Accept) {
service.action = ASCIIToUTF16("http://webintents.org/share");
service.type = ASCIIToUTF16("text/url");
RegisterIntentHandlerInfoBarDelegate delegate(
- contents_wrapper()->infobar_tab_helper(),
+ tab_contents()->infobar_tab_helper(),
WebIntentsRegistryFactory::GetForProfile(profile()),
service, NULL, GURL());