Remove TabContents from geolocation.

chrome/browser/geolocation/geolocation_infobar_queue_controller_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 "base/synchronization/waitable_event.h"
 #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"
-#include "chrome/browser/ui/tab_contents/test_tab_contents.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.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 "testing/gtest/include/gtest/gtest.h"
 
-class GeolocationInfoBarQueueControllerTests : public TabContentsTestHarness {
+class GeolocationInfoBarQueueControllerTests
+    : public ChromeRenderViewHostTestHarness {
  public:
   GeolocationInfoBarQueueControllerTests();
 
  protected:
   int ProcessId();
   int RenderId();
 
  private:
+  // ChromeRenderViewHostTestHarness:
+  virtual void SetUp() OVERRIDE;
+
   content::TestBrowserThread ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarQueueControllerTests);
 };
 
 GeolocationInfoBarQueueControllerTests::GeolocationInfoBarQueueControllerTests()
     : ui_thread_(content::BrowserThread::UI, MessageLoop::current()) {
 }
 
 int GeolocationInfoBarQueueControllerTests::ProcessId() {
   return contents()->GetRenderProcessHost()->GetID();
 }
 
 int GeolocationInfoBarQueueControllerTests::RenderId() {
   return contents()->GetRenderViewHost()->GetRoutingID();
 }
 
+void GeolocationInfoBarQueueControllerTests::SetUp() {
+  ChromeRenderViewHostTestHarness::SetUp();
+  InfoBarTabHelper::CreateForWebContents(web_contents());
+}
+
 class ObservationCountingQueueController :
     public GeolocationInfoBarQueueController {
  public:
   explicit ObservationCountingQueueController(Profile* profile);
 
   int call_count() const { return call_count_; }
 
  private:
   int call_count_;
 
@@ skipping 51 matching lines @@
   ObservationCountingQueueController infobar_queue_controller(profile());
   GURL url("http://www.example.com/geolocation");
   base::Callback<void(bool)> callback;
   infobar_queue_controller.CreateInfoBarRequest(ProcessId(), RenderId(), 1,
                                                 url, url, callback);
   infobar_queue_controller.CreateInfoBarRequest(ProcessId(), RenderId(), 2,
                                                 url, url, callback);
   infobar_queue_controller.CancelInfoBarRequest(ProcessId(), RenderId(), 1);
   EXPECT_EQ(1, infobar_queue_controller.call_count());
 };