Removed Profile::GetHostContentSettingsMap

chrome/browser/ui/exclusive_access/fullscreen_controller.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/ui/exclusive_access/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/web_contents_sizer.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 321 matching lines @@
         ContentSettingsPattern::FromURLNoWildcard(embedder);
 
     // ContentSettings requires valid patterns and the patterns might be invalid
     // in some edge cases like if the current frame is about:blank.
     //
     // Do not store preference on file:// URLs, they don't have a clean
     // origin policy.
     // TODO(estark): Revisit this when crbug.com/455882 is fixed.
     if (!requester.SchemeIsFile() && !embedder.SchemeIsFile() &&
         primary_pattern.IsValid() && secondary_pattern.IsValid()) {
-      HostContentSettingsMap* settings_map = exclusive_access_manager()
-                                                 ->context()
-                                                 ->GetProfile()
-                                                 ->GetHostContentSettingsMap();
+      HostContentSettingsMap* settings_map =
+          HostContentSettingsMapFactory::GetForProfile(
+              exclusive_access_manager()->context()->GetProfile());
       settings_map->SetContentSetting(
           primary_pattern, secondary_pattern, CONTENT_SETTINGS_TYPE_FULLSCREEN,
           std::string(), CONTENT_SETTING_ALLOW);
     }
     tab_fullscreen_accepted_ = true;
     return true;
   }
 
   return false;
 }
@@ skipping 152 matching lines @@
   // decision stick for a particular origin.
   // TODO(estark): Revisit this when crbug.com/455882 is fixed.
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ASK;
 
   if (IsPrivilegedFullscreenForTab())
     return CONTENT_SETTING_ALLOW;
 
   // If the permission was granted to the website with no embedder, it should
   // always be allowed, even if embedded.
-  if (exclusive_access_manager()
-          ->context()
-          ->GetProfile()
-          ->GetHostContentSettingsMap()
-          ->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN,
-                              std::string()) == CONTENT_SETTING_ALLOW) {
+  if (HostContentSettingsMapFactory::GetForProfile(
+        exclusive_access_manager()->context()->GetProfile())
+            ->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN,
+                                std::string()) == CONTENT_SETTING_ALLOW) {
     return CONTENT_SETTING_ALLOW;
   }
 
   // See the comment above the call to |SetContentSetting()| for how the
   // requesting and embedding origins interact with each other wrt permissions.
-  return exclusive_access_manager()
-      ->context()
-      ->GetProfile()
-      ->GetHostContentSettingsMap()
-      ->GetContentSetting(url, GetEmbeddingOrigin(),
-                          CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
+  return HostContentSettingsMapFactory::GetForProfile(
+      exclusive_access_manager()->context()->GetProfile())
+          ->GetContentSetting(url, GetEmbeddingOrigin(),
+                              CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
 }
 
 bool FullscreenController::IsPrivilegedFullscreenForTab() const {
   const bool embedded_widget_present =
       exclusive_access_tab() &&
       exclusive_access_tab()->GetFullscreenRenderWidgetHostView();
   return embedded_widget_present || is_privileged_fullscreen_for_testing_;
 }
 
 void FullscreenController::SetPrivilegedFullscreenForTesting(
@@ skipping 42 matching lines @@
     return fullscreened_origin_;
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }
 
 GURL FullscreenController::GetEmbeddingOrigin() const {
   DCHECK(exclusive_access_tab());
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }