TabContentsWrapper -> TabContents, part 2.

chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc

Index: chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
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 0bd1c8cf9e1d7bc79096273887b6c362c1f7f3d8..9e4f8f2124bb6a00d88f010a6c7a47b2990fb760 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());