Remove TabContents from autofill unittests.

chrome/browser/autofill/autofill_external_delegate_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 <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
-#include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/common/form_data.h"
 #include "chrome/common/form_field_data.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/gfx/rect.h"
 
 using content::BrowserThread;
 using testing::_;
 using WebKit::WebAutofillClient;
@@ skipping 47 matching lines @@
                     const FormData& form,
                     const FormFieldData& field,
                     int unique_id));
 
  protected:
   virtual ~MockAutofillManager() {}
 };
 
 }  // namespace
 
-class AutofillExternalDelegateUnitTest : public TabContentsTestHarness {
+class AutofillExternalDelegateUnitTest
+    : public ChromeRenderViewHostTestHarness {
  public:
   AutofillExternalDelegateUnitTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {}
   virtual ~AutofillExternalDelegateUnitTest() {}
 
  protected:
   // Set up the expectation for a platform specific OnQuery call and then
   // execute it with the given QueryId.
   void IssueOnQuery(int query_id) {
     const FormData form;
     FormFieldData field;
     field.is_focusable = true;
     field.should_autocomplete = true;
     const gfx::Rect bounds;
 
     EXPECT_CALL(*external_delegate_,
                 OnQueryPlatformSpecific(query_id, form, field, bounds));
 
     // This should call OnQueryPlatform specific.
     external_delegate_->OnQuery(query_id, form, field, bounds, false);
   }
 
   scoped_refptr<MockAutofillManager> autofill_manager_;
   scoped_ptr<MockAutofillExternalDelegate> external_delegate_;
 
  private:
   virtual void SetUp() OVERRIDE {
-    TabContentsTestHarness::SetUp();
+    ChromeRenderViewHostTestHarness::SetUp();
     TabAutofillManagerDelegate::CreateForWebContents(web_contents());
     autofill_manager_ = new MockAutofillManager(
         web_contents(),
         TabAutofillManagerDelegate::FromWebContents(web_contents()));
     external_delegate_.reset(new MockAutofillExternalDelegate(
         web_contents(),
         autofill_manager_));
   }
 
   virtual void TearDown() OVERRIDE {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed. Also, a real
     // AutofillManager is tied to the lifetime of the WebContents, so it must
     // be destroyed at the destruction of the WebContents.
     autofill_manager_ = NULL;
-    TabContentsTestHarness::TearDown();
+    ChromeRenderViewHostTestHarness::TearDown();
   }
 
   content::TestBrowserThread ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegateUnitTest);
 };
 
 // Test that our external delegate called the virtual methods at the right time.
 TEST_F(AutofillExternalDelegateUnitTest, TestExternalDelegateVirtualCalls) {
   IssueOnQuery(kQueryId);
@@ skipping 114 matching lines @@
   external_delegate_->SelectAutofillSuggestionAtIndex(1);
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
 TEST_F(AutofillExternalDelegateUnitTest,
        ExternalDelegateHidePopupAfterEditing) {
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   external_delegate_->DidEndTextFieldEditing();
 }