policy: Remove UserCloudPolicyManagerFactory's dependency on Profile.

chrome/browser/ui/webui/policy_ui.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/webui/policy_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 38 matching lines @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
+#include "content/public/browser/web_contents.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/policy/policy_domain_descriptor.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "components/policy/core/common/schema.h"
 #include "extensions/common/manifest.h"
@@ skipping 412 matching lines @@
     policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager =
         policy::UserCloudPolicyManagerFactoryChromeOS::GetForProfile(
             Profile::FromWebUI(web_ui()));
     if (user_cloud_policy_manager) {
       user_status_provider_.reset(
           new UserPolicyStatusProvider(user_cloud_policy_manager->core()));
     }
   }
 #else
   policy::UserCloudPolicyManager* user_cloud_policy_manager =
-      policy::UserCloudPolicyManagerFactory::GetForProfile(
-          Profile::FromWebUI(web_ui()));
+      policy::UserCloudPolicyManagerFactory::GetForBrowserContext(
+          web_ui()->GetWebContents()->GetBrowserContext());

[Joao da Silva, 2013/11/04 12:57:45]

You could keep the Profile::FromWebUI arg here

[pneubeck (no reviews), 2013/11/04 13:01:43]

Yes I could, but it's an unnecessary indirection through Profile and dependency
on Profile, IMO.

For the record, this is the implementation of Profile::FromWebUI:
static_cast<Profile*>(web_ui->GetWebContents()->GetBrowserContext());

   if (user_cloud_policy_manager) {
     user_status_provider_.reset(
         new UserPolicyStatusProvider(user_cloud_policy_manager->core()));
   }
 #endif
 
   if (!user_status_provider_.get())
     user_status_provider_.reset(new CloudPolicyStatusProvider());
   if (!device_status_provider_.get())
     device_status_provider_.reset(new CloudPolicyStatusProvider());
@@ skipping 216 matching lines @@
 }
 
 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new PolicyUIHandler);
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
                                 CreatePolicyUIHTMLSource());
 }
 
 PolicyUI::~PolicyUI() {
 }