Simplify geolocation permission request in the Content API.

chrome/browser/geolocation/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 "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
+#include "chrome/browser/geolocation/geolocation_permission_context.h"
 
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h"
+#include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 77 matching lines @@
   InfoBarService* infobar_service() {
     return InfoBarService::FromWebContents(web_contents());
   }
   InfoBarService* infobar_service_for_tab(int tab) {
     return InfoBarService::FromWebContents(extra_tabs_[tab]);
   }
 
   void RequestGeolocationPermission(content::WebContents* web_contents,
                                     const PermissionRequestID& id,
                                     const GURL& requesting_frame);
-  void CancelGeolocationPermissionRequest(content::WebContents* web_contents,
-                                          const PermissionRequestID& id,
-                                          const GURL& requesting_frame);
+  void RequestGeolocationPermission(content::WebContents* web_contents,
+                                    const PermissionRequestID& id,
+                                    const GURL& requesting_frame,
+                                    base::Closure* cancel_callback);
   void PermissionResponse(const PermissionRequestID& 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_;
+  scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_;
   ClosedInfoBarTracker closed_infobar_tracker_;
   ScopedVector<content::WebContents> extra_tabs_;
 
   // 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_;
 };
 
 PermissionRequestID GeolocationPermissionContextTests::RequestID(
     int bridge_id) {
@@ skipping 11 matching lines @@
       extra_tabs_[tab]->GetRenderProcessHost()->GetID(),
       extra_tabs_[tab]->GetRenderViewHost()->GetRoutingID(),
       bridge_id,
       GURL());
 }
 
 void GeolocationPermissionContextTests::RequestGeolocationPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame) {
+  RequestGeolocationPermission(web_contents, id, requesting_frame, NULL);
+}
+
+void GeolocationPermissionContextTests::RequestGeolocationPermission(
+    content::WebContents* web_contents,
+    const PermissionRequestID& id,
+    const GURL& requesting_frame,
+    base::Closure* cancel_callback) {
   geolocation_permission_context_->RequestGeolocationPermission(
       web_contents, id.bridge_id(), requesting_frame, false,
       base::Bind(&GeolocationPermissionContextTests::PermissionResponse,
-                 base::Unretained(this), id));
+                 base::Unretained(this), id),
+      cancel_callback);
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 }
 
-void GeolocationPermissionContextTests::CancelGeolocationPermissionRequest(
-    content::WebContents* web_contents,
-    const PermissionRequestID& id,
-    const GURL& requesting_frame) {
-  geolocation_permission_context_->CancelGeolocationPermissionRequest(
-      web_contents, id.bridge_id(), requesting_frame);
-}
-
 void GeolocationPermissionContextTests::PermissionResponse(
     const PermissionRequestID& id,
     bool allowed) {
   responses_[id.render_process_id()] = std::make_pair(id.bridge_id(), allowed);
 }
 
 void GeolocationPermissionContextTests::CheckPermissionMessageSent(
     int bridge_id,
     bool allowed) {
   CheckPermissionMessageSentInternal(process(), bridge_id, allowed);
@@ skipping 53 matching lines @@
   ChromeRenderViewHostTestHarness::SetUp();
 
   // Set up required helpers, and make this be as "tabby" as the code requires.
   extensions::SetViewType(web_contents(), extensions::VIEW_TYPE_TAB_CONTENTS);
   InfoBarService::CreateForWebContents(web_contents());
   TabSpecificContentSettings::CreateForWebContents(web_contents());
 #if defined(OS_ANDROID)
   MockGoogleLocationSettingsHelper::SetLocationStatus(true, true);
 #endif
   geolocation_permission_context_ =
-      ChromeGeolocationPermissionContextFactory::GetForProfile(profile());
+      GeolocationPermissionContextFactory::GetForProfile(profile());
 }
 
 void GeolocationPermissionContextTests::TearDown() {
   extra_tabs_.clear();
   ChromeRenderViewHostTestHarness::TearDown();
 }
 
 // Tests ----------------------------------------------------------------------
 
 TEST_F(GeolocationPermissionContextTests, SinglePermission) {
@@ skipping 205 matching lines @@
                 CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
 
   EXPECT_EQ(CONTENT_SETTING_ASK,
             profile()->GetHostContentSettingsMap()->GetContentSetting(
                 requesting_frame_1, requesting_frame_0,
                 CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
 
   NavigateAndCommit(requesting_frame_0);
   EXPECT_EQ(0U, infobar_service()->infobar_count());
   // Request permission for two frames.
+  base::Closure cancel_callback;
   RequestGeolocationPermission(
-      web_contents(), RequestID(0), requesting_frame_0);
+      web_contents(), RequestID(0), requesting_frame_0, &cancel_callback);
   RequestGeolocationPermission(
       web_contents(), RequestID(1), requesting_frame_1);
   ASSERT_EQ(1U, infobar_service()->infobar_count());
 
   infobars::InfoBar* infobar_0 = infobar_service()->infobar_at(0);
   ConfirmInfoBarDelegate* infobar_delegate_0 =
       infobar_0->delegate()->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_delegate_0);
   base::string16 text_0 = infobar_delegate_0->GetMessageText();
 
   // Simulate the frame going away, ensure the infobar for this frame
   // is removed and the next pending infobar is created.
-  CancelGeolocationPermissionRequest(
-      web_contents(), RequestID(0), requesting_frame_0);
+  cancel_callback.Run();
   EXPECT_EQ(1U, closed_infobar_tracker_.size());
   EXPECT_TRUE(closed_infobar_tracker_.Contains(infobar_0));
   closed_infobar_tracker_.Clear();
   ASSERT_EQ(1U, infobar_service()->infobar_count());
 
   infobars::InfoBar* infobar_1 = infobar_service()->infobar_at(0);
   ConfirmInfoBarDelegate* infobar_delegate_1 =
       infobar_1->delegate()->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_delegate_1);
   base::string16 text_1 = infobar_delegate_1->GetMessageText();
@@ skipping 182 matching lines @@
   EXPECT_FALSE(infobar_delegate->ShouldExpire(
       InfoBarService::NavigationDetailsFromLoadCommittedDetails(details)));
   // Ensure the infobar will expire when we commit the pending navigation.
   details.entry = web_contents()->GetController().GetActiveEntry();
   EXPECT_TRUE(infobar_delegate->ShouldExpire(
       InfoBarService::NavigationDetailsFromLoadCommittedDetails(details)));
 
   // Delete the tab contents.
   DeleteContents();
 }