Migrate geolocation settings to host content settings map.

chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc

 // Copyright (c) 2011 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 "base/memory/scoped_vector.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/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/infobar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h"
 #include "content/browser/geolocation/location_arbitrator.h"
 #include "content/browser/geolocation/location_provider.h"
 #include "content/browser/geolocation/mock_location_provider.h"
@@ skipping 199 matching lines @@
   contents_wrapper()->RemoveInfoBar(infobar_0);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
   infobar_0->InfoBarClosed();
 }
 
 TEST_F(GeolocationPermissionContextTests, QueuedPermission) {
   GURL requesting_frame_0("http://www.example.com/geolocation");
   GURL requesting_frame_1("http://www.example-2.com/geolocation");
   EXPECT_EQ(CONTENT_SETTING_ASK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_0, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_0,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
   EXPECT_EQ(CONTENT_SETTING_ASK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_1, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_1,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
+
 
   NavigateAndCommit(requesting_frame_0);
   EXPECT_EQ(0U, contents_wrapper()->infobar_count());
   // Request permission for two frames.
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id(), requesting_frame_0);
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id() + 1, requesting_frame_1);
   // Ensure only one infobar is created.
   ASSERT_EQ(1U, contents_wrapper()->infobar_count());
@@ skipping 25 matching lines @@
   infobar_1->Cancel();
   CheckTabContentsState(requesting_frame_1, CONTENT_SETTING_BLOCK);
   CheckPermissionMessageSent(bridge_id() + 1, false);
   contents_wrapper()->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   infobar_1->InfoBarClosed();
   EXPECT_EQ(0U, contents_wrapper()->infobar_count());
   // Ensure the persisted permissions are ok.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_0, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_0,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
+
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_1, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_1,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
 }
 
 TEST_F(GeolocationPermissionContextTests, CancelGeolocationPermissionRequest) {
   GURL requesting_frame_0("http://www.example.com/geolocation");
   GURL requesting_frame_1("http://www.example-2.com/geolocation");
   EXPECT_EQ(CONTENT_SETTING_ASK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_0, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_0,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
+
   EXPECT_EQ(CONTENT_SETTING_ASK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_1, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_1,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
+
 
   NavigateAndCommit(requesting_frame_0);
   EXPECT_EQ(0U, contents_wrapper()->infobar_count());
   // Request permission for two frames.
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id(), requesting_frame_0);
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id() + 1, requesting_frame_1);
   ASSERT_EQ(1U, contents_wrapper()->infobar_count());
 
@@ skipping 22 matching lines @@
   infobar_1->Accept();
   CheckTabContentsState(requesting_frame_1, CONTENT_SETTING_ALLOW);
   CheckPermissionMessageSent(bridge_id() + 1, true);
   contents_wrapper()->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   infobar_1->InfoBarClosed();
   EXPECT_EQ(0U, contents_wrapper()->infobar_count());
   // Ensure the persisted permissions are ok.
   EXPECT_EQ(CONTENT_SETTING_ASK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_0, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_0,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
+
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_1, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_1,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
 }
 
 TEST_F(GeolocationPermissionContextTests, InvalidURL) {
   GURL invalid_embedder;
   GURL requesting_frame("about:blank");
   NavigateAndCommit(invalid_embedder);
   EXPECT_EQ(0U, contents_wrapper()->infobar_count());
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id(), requesting_frame);
   EXPECT_EQ(0U, contents_wrapper()->infobar_count());
@@ skipping 109 matching lines @@
   infobar_1->InfoBarClosed();
 
   extra_tabs_.reset();
 }
 
 TEST_F(GeolocationPermissionContextTests, TabDestroyed) {
   GURL requesting_frame_0("http://www.example.com/geolocation");
   GURL requesting_frame_1("http://www.example-2.com/geolocation");
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_0, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_0,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
+
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
-      profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame_1, requesting_frame_0));
+      profile()->GetHostContentSettingsMap()->GetContentSetting(
+          requesting_frame_1,
+          requesting_frame_0,
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string()));
 
   NavigateAndCommit(requesting_frame_0);
   EXPECT_EQ(0U, contents_wrapper()->infobar_count());
   // Request permission for two frames.
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id(), requesting_frame_0);
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id() + 1, requesting_frame_1);
   // Ensure only one infobar is created.
   ASSERT_EQ(1U, contents_wrapper()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
       contents_wrapper()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
 
   // Delete the tab contents.
   DeleteContents();
   infobar_0->InfoBarClosed();
 }