Remove IsWebIntentsEnabledForActiveBrowser and change HostContentSettingsMap to use a variant that supplies a PrefService instead.

http://crbug.com/129187
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10432005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138721 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 15 deletions

diff --git a/chrome/browser/intents/register_intent_handler_helper.cc b/chrome/browser/intents/register_intent_handler_helper.cc
index 371b670..abfd47f 100644
--- a/chrome/browser/intents/register_intent_handler_helper.cc
+++ b/chrome/browser/intents/register_intent_handler_helper.cc
@@ -28,7 +28,7 @@ void Browser::RegisterIntentHandlerHelper(WebContents* tab,
   if (!tcw || tcw->profile()->IsOffTheRecord())
     return;
 
-  if (!web_intents::IsWebIntentsEnabled(tcw->profile()))
+  if (!web_intents::IsWebIntentsEnabledForProfile(tcw->profile()))
     return;
 
   FaviconService* favicon_service =
diff --git a/chrome/browser/intents/web_intents_util.cc b/chrome/browser/intents/web_intents_util.cc
index 848d11a..319335b 100644
--- a/chrome/browser/intents/web_intents_util.cc
+++ b/chrome/browser/intents/web_intents_util.cc
@@ -20,17 +20,12 @@ void RegisterUserPrefs(PrefService* user_prefs) {
                                   PrefService::SYNCABLE_PREF);
 }
 
-bool IsWebIntentsEnabled(Profile* profile) {
-  return profile->GetPrefs()->GetBoolean(prefs::kWebIntentsEnabled);
+bool IsWebIntentsEnabled(PrefService* prefs) {
+  return prefs->GetBoolean(prefs::kWebIntentsEnabled);
 }
 
-bool IsWebIntentsEnabledInActiveBrowser() {
-  Browser* browser = BrowserList::GetLastActive();
-  if (!browser)
-    browser = *BrowserList::begin();
-  DCHECK(browser);
-
-  return IsWebIntentsEnabled(browser->profile());
+bool IsWebIntentsEnabledForProfile(Profile* profile) {
+  return IsWebIntentsEnabled(profile->GetPrefs());
 }
 
 }  // namespace web_intents
diff --git a/chrome/browser/intents/web_intents_util.h b/chrome/browser/intents/web_intents_util.h
index cd47ca2..31ac731 100644
--- a/chrome/browser/intents/web_intents_util.h
+++ b/chrome/browser/intents/web_intents_util.h
@@ -14,13 +14,12 @@ namespace web_intents {
 // Registers the preferences related to Web Intents.
 void RegisterUserPrefs(PrefService* user_prefs);
 
+// Returns true if WebIntents are enabled in preferences.
+bool IsWebIntentsEnabled(PrefService* prefs);
+
 // Returns true if WebIntents are enabled due to various factors. |profile| is
 // the Profile to check that WebIntents are enabled for.
-bool IsWebIntentsEnabled(Profile* profile);
-
-// Returns true if WebIntents are enabled due to various factors. Check using
-// the profile of the currently active Browser.
-bool IsWebIntentsEnabledInActiveBrowser();
+bool IsWebIntentsEnabledForProfile(Profile* profile);
 
 }  // namespace web_intents