Removed Profile::GetHostContentSettingsMap

chrome/browser/geolocation/geolocation_browsertest.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 <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.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/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 446 matching lines @@
 
   // Checks bubble is not needed in a second tab.
   ASSERT_TRUE(Initialize(INITIALIZATION_NEWTAB));
   SetFrameHost("");
   RequestPermissionAndObserve(false);
   CheckGeoposition(fake_latitude(), fake_longitude());
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoPromptForDeniedOrigin) {
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
-  current_browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(
-      ContentSettingsPattern::FromURLNoWildcard(current_url()),
-      ContentSettingsPattern::FromURLNoWildcard(current_url()),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), CONTENT_SETTING_BLOCK);
+  HostContentSettingsMapFactory::GetForProfile(current_browser()->profile())
+      ->SetContentSetting(
+          ContentSettingsPattern::FromURLNoWildcard(current_url()),
+          ContentSettingsPattern::FromURLNoWildcard(current_url()),
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string(),
+          CONTENT_SETTING_BLOCK);
 
   // Check that the bubble wasn't shown but we get an error for this origin.
   SetFrameHost("");
   RequestPermissionAndObserve(false);
   CheckStringValueFromJavascript("1", "geoGetLastError()");
 
   // Checks prompt will not be created a second tab.
   ASSERT_TRUE(Initialize(INITIALIZATION_NEWTAB));
   SetFrameHost("");
   RequestPermissionAndObserve(false);
   CheckStringValueFromJavascript("1", "geoGetLastError()");
 }
 
 #if defined(OS_LINUX)
 // http://crbug.com/527437
 #define MAYBE_NoPromptForAllowedOrigin DISABLED_NoPromptForAllowedOrigin
 #else
 #define MAYBE_NoPromptForAllowedOrigin NoPromptForAllowedOrigin
 #endif
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoPromptForAllowedOrigin) {
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
-  current_browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(
-      ContentSettingsPattern::FromURLNoWildcard(current_url()),
-      ContentSettingsPattern::FromURLNoWildcard(current_url()),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), CONTENT_SETTING_ALLOW);
+  HostContentSettingsMapFactory::GetForProfile(current_browser()->profile())
+      ->SetContentSetting(
+          ContentSettingsPattern::FromURLNoWildcard(current_url()),
+          ContentSettingsPattern::FromURLNoWildcard(current_url()),
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string(),
+          CONTENT_SETTING_ALLOW);
   // Checks no prompt will be created and there's no error callback.
   SetFrameHost("");
   RequestPermissionAndObserve(false);
   CheckGeoposition(fake_latitude(), fake_longitude());
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoPromptForOffTheRecord) {
   // Check prompt will be created and persisted for regular profile.
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   SetFrameHost("");
@@ skipping 211 matching lines @@
 
 #if defined(OS_LINUX)
 // http://crbug.com/527437
 #define MAYBE_LastUsageUpdated DISABLED_LastUsageUpdated
 #else
 #define MAYBE_LastUsageUpdated LastUsageUpdated
 #endif
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_LastUsageUpdated) {
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   base::SimpleTestClock* clock_ = new base::SimpleTestClock();
-  current_browser()
-      ->profile()
-      ->GetHostContentSettingsMap()
+  HostContentSettingsMapFactory::GetForProfile(current_browser()->profile())
       ->SetPrefClockForTesting(scoped_ptr<base::Clock>(clock_));
   clock_->SetNow(base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(10));
 
   // Setting the permission should trigger the last usage.
-  current_browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(
-      ContentSettingsPattern::FromURLNoWildcard(current_url()),
-      ContentSettingsPattern::FromURLNoWildcard(current_url()),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION,
-      std::string(),
-      CONTENT_SETTING_ALLOW);
+  HostContentSettingsMapFactory::GetForProfile(current_browser()->profile())
+      ->SetContentSetting(
+          ContentSettingsPattern::FromURLNoWildcard(current_url()),
+          ContentSettingsPattern::FromURLNoWildcard(current_url()),
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string(),
+          CONTENT_SETTING_ALLOW);
 
   // Permission has been used at the starting time.
-  EXPECT_EQ(current_browser()
-                ->profile()
-                ->GetHostContentSettingsMap()
-                ->GetLastUsage(current_url().GetOrigin(),
-                               current_url().GetOrigin(),
-                               CONTENT_SETTINGS_TYPE_GEOLOCATION)
-                .ToDoubleT(),
-            10);
+  EXPECT_EQ(HostContentSettingsMapFactory::GetForProfile(
+      current_browser()->profile())->GetLastUsage(
+          current_url().GetOrigin(),
+          current_url().GetOrigin(),
+          CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 10);
 
   clock_->Advance(base::TimeDelta::FromSeconds(3));
 
   // Watching should trigger the last usage update.
   SetFrameHost("");
   RequestPermissionAndObserve(false);
   CheckGeoposition(fake_latitude(), fake_longitude());
 
   // Last usage has been updated.
-  EXPECT_EQ(current_browser()
-                ->profile()
-                ->GetHostContentSettingsMap()
-                ->GetLastUsage(current_url().GetOrigin(),
-                               current_url().GetOrigin(),
-                               CONTENT_SETTINGS_TYPE_GEOLOCATION)
-                .ToDoubleT(),
-            13);
+  EXPECT_EQ(HostContentSettingsMapFactory::GetForProfile(
+      current_browser()->profile())->GetLastUsage(
+          current_url().GetOrigin(),
+          current_url().GetOrigin(),
+          CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 13);
 }