TabContentsWrapper -> TabContents, part 2.

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/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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/gfx/rect.h"
 #include "webkit/forms/form_data.h"
 #include "webkit/forms/form_field.h"
 
 using content::BrowserThread;
@@ skipping 43 matching lines @@
                     const webkit::forms::FormData& form,
                     const webkit::forms::FormField& field,
                     int unique_id));
 
  protected:
   virtual ~MockAutofillManager() {}
 };
 
 }  // namespace
 
-class AutofillExternalDelegateUnitTest : public TabContentsWrapperTestHarness {
+class AutofillExternalDelegateUnitTest : public TabContentsTestHarness {
  public:
   AutofillExternalDelegateUnitTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {}
   virtual ~AutofillExternalDelegateUnitTest() {}
 
   virtual void SetUp() OVERRIDE {
-    TabContentsWrapperTestHarness::SetUp();
-    autofill_manager_ = new MockAutofillManager(contents_wrapper());
+    TabContentsTestHarness::SetUp();
+    autofill_manager_ = new MockAutofillManager(tab_contents());
     external_delegate_.reset(new MockAutofillExternalDelegate(
-        contents_wrapper(),
+        tab_contents(),
         autofill_manager_));
   }
 
  protected:
   scoped_refptr<MockAutofillManager> autofill_manager_;
   scoped_ptr<MockAutofillExternalDelegate> external_delegate_;
 
  private:
   content::TestBrowserThread ui_thread_;
 
@@ skipping 69 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();
 }