Removed Profile::GetHostContentSettingsMap

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/geolocation_permission_context.h"
 
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/id_map.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/simple_test_clock.h"
 #include "base/time/clock.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 291 matching lines @@
 }
 
 void GeolocationPermissionContextTests::BubbleManagerDocumentLoadCompleted(
     content::WebContents* web_contents) {
   PermissionBubbleManager::FromWebContents(web_contents)->
       DocumentOnLoadCompletedInMainFrame();
 }
 
 ContentSetting GeolocationPermissionContextTests::GetGeolocationContentSetting(
     GURL frame_0, GURL frame_1) {
-  return profile()->GetHostContentSettingsMap()->GetContentSetting(
-      frame_0, frame_1, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string());
+  return HostContentSettingsMapFactory::GetForProfile(profile())
+      ->GetContentSetting(frame_0,
+                          frame_1,
+                          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                          std::string());
 }
 
 bool GeolocationPermissionContextTests::BubbleEnabled() const {
   return PermissionBubbleManager::Enabled();
 }
 
 size_t GeolocationPermissionContextTests::GetNumberOfPrompts() {
   if (BubbleEnabled()) {
     PermissionBubbleManager* manager =
         PermissionBubbleManager::FromWebContents(web_contents());
@@ skipping 481 matching lines @@
 
 TEST_F(GeolocationPermissionContextTests, LastUsageAudited) {
   GURL requesting_frame("http://www.example.com/geolocation");
   NavigateAndCommit(requesting_frame);
   if (BubbleEnabled()) BubbleManagerDocumentLoadCompleted();
 
   base::SimpleTestClock* test_clock = new base::SimpleTestClock;
   test_clock->SetNow(base::Time::UnixEpoch() +
                      base::TimeDelta::FromSeconds(10));
 
-  HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
+  HostContentSettingsMap* map =
+      HostContentSettingsMapFactory::GetForProfile(profile());
   map->SetPrefClockForTesting(scoped_ptr<base::Clock>(test_clock));
 
   // The permission shouldn't have been used yet.
   EXPECT_EQ(map->GetLastUsage(requesting_frame.GetOrigin(),
                               requesting_frame.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
             0);
   ASSERT_EQ(0U, GetNumberOfPrompts());
   RequestGeolocationPermission(
       web_contents(), RequestID(0), requesting_frame, false);
@@ skipping 18 matching lines @@
                               requesting_frame.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
             13);
 }
 
 TEST_F(GeolocationPermissionContextTests, LastUsageAuditedMultipleFrames) {
   base::SimpleTestClock* test_clock = new base::SimpleTestClock;
   test_clock->SetNow(base::Time::UnixEpoch() +
                      base::TimeDelta::FromSeconds(10));
 
-  HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
+  HostContentSettingsMap* map =
+      HostContentSettingsMapFactory::GetForProfile(profile());
   map->SetPrefClockForTesting(scoped_ptr<base::Clock>(test_clock));
 
   GURL requesting_frame_0("http://www.example.com/geolocation");
   GURL requesting_frame_1("http://www.example-2.com/geolocation");
 
   // The permission shouldn't have been used yet.
   EXPECT_EQ(map->GetLastUsage(requesting_frame_0.GetOrigin(),
                               requesting_frame_0.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
             0);
@@ skipping 63 matching lines @@
   // it is the embedder.
   EXPECT_EQ(map->GetLastUsage(requesting_frame_0.GetOrigin(),
                               requesting_frame_0.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
             13);
   EXPECT_EQ(map->GetLastUsage(requesting_frame_1.GetOrigin(),
                               requesting_frame_0.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
             11);
 }