Refactor away the Browser* dependency in exclusive_access

chrome/browser/ui/exclusive_access/mouse_lock_controller.cc

 // Copyright (c) 2015 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/mouse_lock_controller.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.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_controller.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 
 using content::RenderViewHost;
 using content::WebContents;
 
-MouseLockController::MouseLockController(ExclusiveAccessManager* manager,
-                                         Browser* browser)
-    : ExclusiveAccessControllerBase(manager, browser),
+MouseLockController::MouseLockController(ExclusiveAccessManager* manager)
+    : ExclusiveAccessControllerBase(manager),
       mouse_lock_state_(MOUSELOCK_NOT_REQUESTED) {
 }
 
 MouseLockController::~MouseLockController() {
 }
 
 bool MouseLockController::IsMouseLocked() const {
   return mouse_lock_state_ == MOUSELOCK_ACCEPTED ||
          mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENTLY;
 }
@@ skipping 96 matching lines @@
   ExclusiveAccessBubbleType bubble_type =
       exclusive_access_manager()->GetExclusiveAccessExitBubbleType();
   bool mouse_lock = false;
   exclusive_access_bubble::PermissionRequestedByType(bubble_type, nullptr,
                                                      &mouse_lock);
   DCHECK(!(mouse_lock && IsMouseLocked()));
 
   if (mouse_lock && !IsMouseLocked()) {
     DCHECK(IsMouseLockRequested());
 
-    HostContentSettingsMap* settings_map =
-        profile()->GetHostContentSettingsMap();
+    HostContentSettingsMap* settings_map = exclusive_access_manager()
+                                               ->exclusive_access_context()
+                                               ->GetProfile()
+                                               ->GetHostContentSettingsMap();
 
     GURL url = GetExclusiveAccessBubbleURL();
     ContentSettingsPattern pattern = ContentSettingsPattern::FromURL(url);
 
     // TODO(markusheintz): We should allow patterns for all possible URLs here.
     if (pattern.IsValid()) {
       settings_map->SetContentSetting(pattern,
                                       ContentSettingsPattern::Wildcard(),
                                       CONTENT_SETTINGS_TYPE_MOUSELOCK,
                                       std::string(), CONTENT_SETTING_ALLOW);
@@ skipping 70 matching lines @@
     mouse_lock_view->UnlockMouse();
 }
 
 ContentSetting MouseLockController::GetMouseLockSetting(const GURL& url) const {
   if (exclusive_access_manager()
           ->fullscreen_controller()
           ->IsPrivilegedFullscreenForTab() ||
       url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;
 
-  HostContentSettingsMap* settings_map = profile()->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings_map = exclusive_access_manager()
+                                             ->exclusive_access_context()
+                                             ->GetProfile()
+                                             ->GetHostContentSettingsMap();
   return settings_map->GetContentSetting(
       url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
 }