TabContentsWrapper -> TabContents, part 2.

chrome/browser/geolocation/chrome_geolocation_permission_context_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 <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.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/chrome_notification_types.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.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 "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
@@ skipping 52 matching lines @@
   return removed_infobar_delegates_.count(delegate) != 0;
 }
 
 void ClosedDelegateTracker::Clear() {
   removed_infobar_delegates_.clear();
 }
 
 // GeolocationPermissionContextTests ------------------------------------------
 
 // This class sets up GeolocationArbitrator.
-class GeolocationPermissionContextTests : public TabContentsWrapperTestHarness {
+class GeolocationPermissionContextTests : public TabContentsTestHarness {
  public:
   GeolocationPermissionContextTests();
 
  protected:
   virtual ~GeolocationPermissionContextTests();
 
   int process_id() {
     return contents()->GetRenderProcessHost()->GetID();
   }
   int process_id_for_tab(int tab) {
     return extra_tabs_[tab]->web_contents()->GetRenderProcessHost()->GetID();
   }
   int render_id() { return contents()->GetRenderViewHost()->GetRoutingID(); }
   int render_id_for_tab(int tab) {
     return extra_tabs_[tab]->web_contents()->
         GetRenderViewHost()->GetRoutingID();
   }
   int bridge_id() const { return 42; }  // Not relevant at this level.
   InfoBarTabHelper* infobar_tab_helper() {
-    return contents_wrapper()->infobar_tab_helper();
+    return tab_contents()->infobar_tab_helper();
   }
 
   void RequestGeolocationPermission(int render_process_id,
                                     int render_view_id,
                                     int bridge_id,
                                     const GURL& requesting_frame);
   void PermissionResponse(int render_process_id,
                           int render_view_id,
                           int bridge_id,
                           bool allowed);
   void CheckPermissionMessageSent(int bridge_id, bool allowed);
   void CheckPermissionMessageSentForTab(int tab, int bridge_id, bool allowed);
   void CheckPermissionMessageSentInternal(MockRenderProcessHost* process,
                                           int bridge_id,
                                           bool allowed);
   void AddNewTab(const GURL& url);
   void CheckTabContentsState(const GURL& requesting_frame,
                              ContentSetting expected_content_setting);
 
   scoped_refptr<ChromeGeolocationPermissionContext>
       geolocation_permission_context_;
   ClosedDelegateTracker closed_delegate_tracker_;
   ScopedVector<TabContentsWrapper> extra_tabs_;
 
  private:
-  // TabContentsWrapperTestHarness:
+  // TabContentsTestHarness:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
 
   // A map between renderer child id and a pair represending the bridge id and
   // whether the requested permission was allowed.
   base::hash_map<int, std::pair<int, bool> > responses_;
 };
 
 GeolocationPermissionContextTests::GeolocationPermissionContextTests()
-    : TabContentsWrapperTestHarness(),
+    : TabContentsTestHarness(),
       ui_thread_(BrowserThread::UI, MessageLoop::current()),
       db_thread_(BrowserThread::DB) {
 }
 
 GeolocationPermissionContextTests::~GeolocationPermissionContextTests() {
 }
 
 void GeolocationPermissionContextTests::RequestGeolocationPermission(
     int render_process_id,
     int render_view_id,
@@ skipping 48 matching lines @@
       url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
   RenderViewHostTester::For(new_tab->GetRenderViewHost())->
       SendNavigate(extra_tabs_.size() + 1, url);
   extra_tabs_.push_back(new TabContentsWrapper(new_tab));
 }
 
 void GeolocationPermissionContextTests::CheckTabContentsState(
     const GURL& requesting_frame,
     ContentSetting expected_content_setting) {
   TabSpecificContentSettings* content_settings =
-      contents_wrapper()->content_settings();
+      tab_contents()->content_settings();
   const GeolocationSettingsState::StateMap& state_map =
       content_settings->geolocation_settings_state().state_map();
   EXPECT_EQ(1U, state_map.count(requesting_frame.GetOrigin()));
   EXPECT_EQ(0U, state_map.count(requesting_frame));
   GeolocationSettingsState::StateMap::const_iterator settings =
       state_map.find(requesting_frame.GetOrigin());
   ASSERT_FALSE(settings == state_map.end())
       << "geolocation state not found " << requesting_frame;
   EXPECT_EQ(expected_content_setting, settings->second);
 }
 
 void GeolocationPermissionContextTests::SetUp() {
   db_thread_.Start();
-  TabContentsWrapperTestHarness::SetUp();
+  TabContentsTestHarness::SetUp();
   geolocation_permission_context_ =
       new ChromeGeolocationPermissionContext(profile());
 }
 
 void GeolocationPermissionContextTests::TearDown() {
   extra_tabs_.reset();
-  TabContentsWrapperTestHarness::TearDown();
+  TabContentsTestHarness::TearDown();
   // Schedule another task on the DB thread to notify us that it's safe to
   // carry on with the test.
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
   db_thread_.Stop();
 }
 
 
@@ skipping 350 matching lines @@
   ASSERT_FALSE(infobar_0->ShouldExpire(details));
   // Commit the "GoBack()" above, and ensure the infobar is now expired.
   WebContentsTester::For(contents())->CommitPendingNavigation();
   details.entry = contents()->GetController().GetLastCommittedEntry();
   ASSERT_TRUE(infobar_0->ShouldExpire(details));
 
   // Delete the tab contents.
   DeleteContents();
   infobar_0->InfoBarClosed();
 }