| Index: chrome/browser/geolocation/geolocation_infobar_queue_controller_unittest.cc
|
| diff --git a/chrome/browser/geolocation/geolocation_infobar_queue_controller_unittest.cc b/chrome/browser/geolocation/geolocation_infobar_queue_controller_unittest.cc
|
| index 30586cde5a23f49ae13c5f2f459219e66f88ea5c..44a0710a038b0167eee3f490bc9f6da2756eb4d8 100644
|
| --- a/chrome/browser/geolocation/geolocation_infobar_queue_controller_unittest.cc
|
| +++ b/chrome/browser/geolocation/geolocation_infobar_queue_controller_unittest.cc
|
| @@ -15,38 +15,20 @@
|
|
|
| class GeolocationInfoBarQueueControllerTests
|
| : public ChromeRenderViewHostTestHarness {
|
| - public:
|
| - GeolocationInfoBarQueueControllerTests();
|
| -
|
| protected:
|
| - GeolocationPermissionRequestID RequestID(int bridge_id);
|
| -
|
| - private:
|
| - // ChromeRenderViewHostTestHarness:
|
| - virtual void SetUp() OVERRIDE;
|
| -
|
| - content::TestBrowserThread ui_thread_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarQueueControllerTests);
|
| + virtual void SetUp() OVERRIDE {
|
| + ChromeRenderViewHostTestHarness::SetUp();
|
| + InfoBarService::CreateForWebContents(web_contents());
|
| + }
|
| +
|
| + GeolocationPermissionRequestID RequestID(int bridge_id) {
|
| + return GeolocationPermissionRequestID(
|
| + web_contents()->GetRenderProcessHost()->GetID(),
|
| + web_contents()->GetRenderViewHost()->GetRoutingID(),
|
| + bridge_id);
|
| + }
|
| };
|
|
|
| -GeolocationInfoBarQueueControllerTests::GeolocationInfoBarQueueControllerTests()
|
| - : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()) {
|
| -}
|
| -
|
| -GeolocationPermissionRequestID
|
| - GeolocationInfoBarQueueControllerTests::RequestID(int bridge_id) {
|
| - return GeolocationPermissionRequestID(
|
| - web_contents()->GetRenderProcessHost()->GetID(),
|
| - web_contents()->GetRenderViewHost()->GetRoutingID(),
|
| - bridge_id);
|
| -}
|
| -
|
| -void GeolocationInfoBarQueueControllerTests::SetUp() {
|
| - ChromeRenderViewHostTestHarness::SetUp();
|
| - InfoBarService::CreateForWebContents(web_contents());
|
| -}
|
| -
|
| class ObservationCountingQueueController :
|
| public GeolocationInfoBarQueueController {
|
| public:
|
|
|