TabContentsWrapper -> TabContents, part 2.

chrome/browser/autofill/autofill_manager_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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/tuple.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/browser.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/common/autofill_messages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_test_sink.h"
@@ skipping 531 matching lines @@
 
   std::string submitted_form_signature_;
   std::vector<FieldTypeSet> expected_submitted_field_types_;
   std::vector<bool> sent_states_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillManager);
 };
 
 }  // namespace
 
-class AutofillManagerTest : public TabContentsWrapperTestHarness {
+class AutofillManagerTest : public TabContentsTestHarness {
  public:
   typedef AutofillManager::GUIDPair GUIDPair;
 
   AutofillManagerTest()
-      : TabContentsWrapperTestHarness(),
+      : TabContentsTestHarness(),
         ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE) {
   }
 
   virtual ~AutofillManagerTest() {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed.
     autofill_manager_ = NULL;
   }
 
   virtual void SetUp() OVERRIDE {
     Profile* profile = new TestingProfile();
     browser_context_.reset(profile);
     PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
         profile, TestPersonalDataManager::Build);
 
-    TabContentsWrapperTestHarness::SetUp();
-    autofill_manager_ = new TestAutofillManager(contents_wrapper(),
+    TabContentsTestHarness::SetUp();
+    autofill_manager_ = new TestAutofillManager(tab_contents(),
                                                 &personal_data_);
 
     file_thread_.Start();
   }
 
   virtual void TearDown() OVERRIDE {
     file_thread_.Stop();
-    TabContentsWrapperTestHarness::TearDown();
+    TabContentsTestHarness::TearDown();
   }
 
   void UpdatePasswordGenerationState(bool new_renderer) {
     autofill_manager_->UpdatePasswordGenerationState(NULL, new_renderer);
   }
 
   void GetAutofillSuggestions(int query_id,
                               const webkit::forms::FormData& form,
                               const webkit::forms::FormField& field) {
     autofill_manager_->OnQueryFormFieldAutofill(query_id,
                                                 form,
                                                 field,
                                                 gfx::Rect(),
                                                 false);
   }
 
   void GetAutofillSuggestions(const webkit::forms::FormData& form,
                               const webkit::forms::FormField& field) {
     GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
   void AutocompleteSuggestionsReturned(const std::vector<string16>& result) {
-    contents_wrapper()->autocomplete_history_manager()->
+    tab_contents()->autocomplete_history_manager()->
         SendSuggestions(&result);
   }
 
   void FormsSeen(const std::vector<webkit::forms::FormData>& forms) {
     autofill_manager_->OnFormsSeen(forms, base::TimeTicks());
   }
 
   void FormSubmitted(const FormData& form) {
     if (autofill_manager_->OnFormSubmitted(form, base::TimeTicks::Now()))
       autofill_manager_->WaitForAsyncFormSubmit();
@@ skipping 27 matching lines @@
       *page_id = autofill_param.a;
     if (values)
       *values = autofill_param.b;
     if (labels)
       *labels = autofill_param.c;
     if (icons)
       *icons = autofill_param.d;
     if (unique_ids)
       *unique_ids = autofill_param.e;
 
-    contents_wrapper()->autocomplete_history_manager()->CancelPendingQuery();
+    tab_contents()->autocomplete_history_manager()->CancelPendingQuery();
     process()->sink().ClearMessages();
     return true;
   }
 
   bool GetAutofillFormDataFilledMessage(int *page_id, FormData* results) {
     const uint32 kMsgID = AutofillMsg_FormDataFilled::ID;
     const IPC::Message* message =
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
@@ skipping 2395 matching lines @@
                                        const gfx::Rect& bounds) OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillExternalDelegate);
 };
 
 }  // namespace
 
 // Test our external delegate is called at the right time.
 TEST_F(AutofillManagerTest, TestExternalDelegate) {
-  MockAutofillExternalDelegate external_delegate(contents_wrapper(),
+  MockAutofillExternalDelegate external_delegate(tab_contents(),
                                                  autofill_manager_);
   EXPECT_CALL(external_delegate, OnQuery(_, _, _, _, _));
   autofill_manager_->SetExternalDelegate(&external_delegate);
 
   FormData form;
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
   const FormField& field = form.fields[0];
   GetAutofillSuggestions(form, field);  // should call the delegate's OnQuery()
 
   autofill_manager_->SetExternalDelegate(NULL);
 }
 
 #if defined(OS_ANDROID) || defined(TOOLKIT_GTK)
 // OS_ANDROID defines an external delegate, but prerequisites for
 // landing autofill_external_delegate_android.cc in the Chromium tree
 // have not themselves landed.
 
 // Turn on the external delegate.  Recreate a WebContents.  Make sure
 // an external delegate was set in the proper structures.
 TEST_F(AutofillManagerTest, TestTabContentsWithExternalDelegate) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kExternalAutofillPopup);
 
   // Setting the contents creates a new TabContentsWrapper.
   WebContents* contents = CreateTestWebContents();
   SetContents(contents);
 
-  AutofillManager* autofill_manager = contents_wrapper()->autofill_manager();
+  AutofillManager* autofill_manager = tab_contents()->autofill_manager();
   EXPECT_TRUE(autofill_manager->external_delegate());
 
   AutocompleteHistoryManager* autocomplete_history_manager =
-      contents_wrapper()->autocomplete_history_manager();
+      tab_contents()->autocomplete_history_manager();
   EXPECT_TRUE(autocomplete_history_manager->external_delegate());
 }
 
 #endif  // OS_ANDROID