TabContentsWrapper -> TabContents, part 2.

chrome/browser/automation/automation_tab_helper_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/automation/mock_tab_event_observer.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 "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using testing::_;
 
-class AutomationTabHelperTest : public TabContentsWrapperTestHarness {
+class AutomationTabHelperTest : public TabContentsTestHarness {
  public:
   AutomationTabHelperTest()
-      : TabContentsWrapperTestHarness(),
+      : TabContentsTestHarness(),
         browser_thread_(BrowserThread::UI, &message_loop_) {}
 
   virtual void SetUp() {
-    TabContentsWrapperTestHarness::SetUp();
+    TabContentsTestHarness::SetUp();
     mock_observer_.StartObserving(tab_helper());
   }
 
  protected:
   // These are here so that we don't have to add each test as a
   // |AutomationTabHelper| friend.
   void StartLoading() {
     tab_helper()->DidStartLoading();
   }
 
   void StopLoading() {
     tab_helper()->DidStopLoading();
   }
 
   void TabContentsDestroyed() {
-    tab_helper()->WebContentsDestroyed(contents_wrapper()->web_contents());
+    tab_helper()->WebContentsDestroyed(tab_contents()->web_contents());
   }
 
   void WillPerformClientRedirect(int64 frame_id) {
     tab_helper()->OnWillPerformClientRedirect(frame_id, 0);
   }
 
   void CompleteOrCancelClientRedirect(int64 frame_id) {
     tab_helper()->OnDidCompleteOrCancelClientRedirect(frame_id);
   }
 
   AutomationTabHelper* tab_helper() {
-    return contents_wrapper()->automation_tab_helper();
+    return tab_contents()->automation_tab_helper();
   }
 
   content::TestBrowserThread browser_thread_;
 
   MockTabEventObserver mock_observer_;
 };
 
 ACTION_P2(CheckHasPendingLoads, tab_helper, has_pending_loads) {
   EXPECT_EQ(has_pending_loads, tab_helper->has_pending_loads());
 }
@@ skipping 139 matching lines @@
 
   testing::InSequence expect_in_sequence;
   EXPECT_CALL(mock_observer_, OnFirstPendingLoad(contents()));
   EXPECT_CALL(mock_observer_, OnNoMorePendingLoads(contents()));
 
   StartLoading();
   WillPerformClientRedirect(1);
   TabContentsDestroyed();
   EXPECT_FALSE(tab_helper()->has_pending_loads());
 }