Remove TabContents from AutomationTabHelperTest.

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.h"
-#include "chrome/browser/ui/tab_contents/test_tab_contents.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.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 TabContentsTestHarness {
+class AutomationTabHelperTest : public ChromeRenderViewHostTestHarness {
  public:
   AutomationTabHelperTest()
-      : TabContentsTestHarness(),
+      : ChromeRenderViewHostTestHarness(),
         browser_thread_(BrowserThread::UI, &message_loop_) {}
 
   virtual void SetUp() {
-    TabContentsTestHarness::SetUp();
+    ChromeRenderViewHostTestHarness::SetUp();
+    AutomationTabHelper::CreateForWebContents(web_contents());
     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(NULL);
   }
 
   void StopLoading() {
     tab_helper()->DidStopLoading(NULL);
   }
 
-  void TabContentsDestroyed() {
+  void WebContentsDestroyed() {
     tab_helper()->WebContentsDestroyed(web_contents());
   }
 
   void WillPerformClientRedirect(int64 frame_id) {
     tab_helper()->OnWillPerformClientRedirect(frame_id, 0);
   }
 
   void CompleteOrCancelClientRedirect(int64 frame_id) {
     tab_helper()->OnDidCompleteOrCancelClientRedirect(frame_id);
   }
@@ skipping 149 matching lines @@
 
 TEST_F(AutomationTabHelperTest, DestroyedTabStopsLoading) {
   testing::MockFunction<void()> check;
 
   testing::InSequence expect_in_sequence;
   EXPECT_CALL(mock_observer_, OnFirstPendingLoad(contents()));
   EXPECT_CALL(mock_observer_, OnNoMorePendingLoads(contents()));
 
   StartLoading();
   WillPerformClientRedirect(1);
-  TabContentsDestroyed();
+  WebContentsDestroyed();
   EXPECT_FALSE(tab_helper()->has_pending_loads());
 }