TabContentsWrapper -> TabContents, part 2.

chrome/browser/autofill/autofill_metrics_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/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_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/browser/webdata/web_data_service.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 "ui/gfx/rect.h"
 #include "webkit/forms/form_data.h"
 #include "webkit/forms/form_field.h"
 
 using content::BrowserThread;
@@ skipping 217 matching lines @@
 
   bool autofill_enabled_;
   bool did_finish_async_form_submit_;
   bool message_loop_is_running_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillManager);
 };
 
 }  // namespace
 
-class AutofillMetricsTest : public TabContentsWrapperTestHarness {
+class AutofillMetricsTest : public TabContentsTestHarness {
  public:
   AutofillMetricsTest();
   virtual ~AutofillMetricsTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   AutofillCCInfoBarDelegate* CreateDelegate(MockAutofillMetrics* metric_logger,
                                             CreditCard** created_card);
 
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   scoped_refptr<TestAutofillManager> autofill_manager_;
   TestPersonalDataManager personal_data_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutofillMetricsTest);
 };
 
 AutofillMetricsTest::AutofillMetricsTest()
-  : TabContentsWrapperTestHarness(),
+  : TabContentsTestHarness(),
     ui_thread_(BrowserThread::UI, &message_loop_),
     file_thread_(BrowserThread::FILE) {
 }
 
 AutofillMetricsTest::~AutofillMetricsTest() {
   // Order of destruction is important as AutofillManager relies on
   // PersonalDataManager to be around when it gets destroyed.
   autofill_manager_ = NULL;
 }
 
 void AutofillMetricsTest::SetUp() {
   Profile* profile = new TestingProfile();
   browser_context_.reset(profile);
   PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
       profile, NULL);
 
-  TabContentsWrapperTestHarness::SetUp();
-  autofill_manager_ = new TestAutofillManager(contents_wrapper(),
+  TabContentsTestHarness::SetUp();
+  autofill_manager_ = new TestAutofillManager(tab_contents(),
                                               &personal_data_);
 
   file_thread_.Start();
 }
 
 void AutofillMetricsTest::TearDown() {
   file_thread_.Stop();
-  TabContentsWrapperTestHarness::TearDown();
+  TabContentsTestHarness::TearDown();
 }
 
 AutofillCCInfoBarDelegate* AutofillMetricsTest::CreateDelegate(
     MockAutofillMetrics* metric_logger,
     CreditCard** created_card) {
   EXPECT_CALL(*metric_logger,
               LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN));
   // The delegate created below will take ownership of this object.
   CreditCard* credit_card = new CreditCard();
   if (created_card)
     *created_card = credit_card;
-  return new AutofillCCInfoBarDelegate(contents_wrapper()->infobar_tab_helper(),
+  return new AutofillCCInfoBarDelegate(tab_contents()->infobar_tab_helper(),
                                        credit_card,
                                        &personal_data_,
                                        metric_logger);
 }
 
 // Test that we log quality metrics appropriately.
 TEST_F(AutofillMetricsTest, QualityMetrics) {
   // Set up our form data.
   FormData form;
   form.name = ASCIIToUTF16("TestForm");
@@ skipping 1132 matching lines @@
     autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
                                             TimeTicks::FromInternalValue(3));
     autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
     autofill_manager_->Reset();
     Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
   }
 
   // Restore the global Gmock verbosity level to its default value.
   ::testing::FLAGS_gmock_verbose = "warning";
 }