Removed Profile::GetHostContentSettingsMap

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 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/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/android/android_about_app_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
@@ skipping 23 matching lines @@
   NETWORK_PREDICTION_WIFI_ONLY,
   NETWORK_PREDICTION_NEVER,
 };
 
 Profile* GetOriginalProfile() {
   return ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
 }
 
 bool GetBooleanForContentSetting(ContentSettingsType type) {
   HostContentSettingsMap* content_settings =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   switch (content_settings->GetDefaultContentSetting(type, NULL)) {
     case CONTENT_SETTING_BLOCK:
       return false;
     case CONTENT_SETTING_ALLOW:
       return true;
     case CONTENT_SETTING_ASK:
     default:
       return true;
   }
 }
@@ skipping 15 matching lines @@
       return "num_settings";
     case CONTENT_SETTING_DEFAULT:
     default:
       return "default";
   }
 }
 
 bool IsContentSettingManaged(ContentSettingsType content_settings_type) {
   std::string source;
   HostContentSettingsMap* content_settings =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   content_settings->GetDefaultContentSetting(content_settings_type, &source);
   HostContentSettingsMap::ProviderType provider =
       content_settings->GetProviderTypeFromSource(source);
   return provider == HostContentSettingsMap::POLICY_PROVIDER;
 }
 
 bool IsContentSettingManagedByCustodian(
     ContentSettingsType content_settings_type) {
   std::string source;
   HostContentSettingsMap* content_settings =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   content_settings->GetDefaultContentSetting(content_settings_type, &source);
   HostContentSettingsMap::ProviderType provider =
       content_settings->GetProviderTypeFromSource(source);
   return provider == HostContentSettingsMap::SUPERVISED_PROVIDER;
 }
 
 bool IsContentSettingUserModifiable(ContentSettingsType content_settings_type) {
   std::string source;
   HostContentSettingsMap* content_settings =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   content_settings->GetDefaultContentSetting(content_settings_type, &source);
   HostContentSettingsMap::ProviderType provider =
       content_settings->GetProviderTypeFromSource(source);
   return provider >= HostContentSettingsMap::PREF_PROVIDER;
 }
 
 PrefService* GetPrefService() {
   return GetOriginalProfile()->GetPrefs();
 }
 
@@ skipping 18 matching lines @@
   DCHECK(content_settings_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
          content_settings_type == CONTENT_SETTINGS_TYPE_IMAGES ||
          content_settings_type == CONTENT_SETTINGS_TYPE_POPUPS);
   ContentSettingsType type =
       static_cast<ContentSettingsType>(content_settings_type);
   if (type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
       type == CONTENT_SETTINGS_TYPE_POPUPS)
     return GetBooleanForContentSetting(type);
 
   HostContentSettingsMap* content_settings =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   return content_settings->GetDefaultContentSetting(
       type, nullptr) == CONTENT_SETTING_ALLOW;
 }
 
 static void SetContentSettingEnabled(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj,
                                      int content_settings_type,
                                      jboolean allow) {
   // Before we migrate functions over to this central function, we must verify
   // that the new category supports ALLOW/BLOCK pairs and, if not, handle them.
   DCHECK(content_settings_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
          content_settings_type == CONTENT_SETTINGS_TYPE_IMAGES ||
          content_settings_type == CONTENT_SETTINGS_TYPE_POPUPS);
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       static_cast<ContentSettingsType>(content_settings_type),
       allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
 }
 
 static void SetContentSettingForPattern(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj,
                                         int content_settings_type,
                                         const JavaParamRef<jstring>& pattern,
                                         int setting) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetContentSetting(
       ContentSettingsPattern::FromString(ConvertJavaStringToUTF8(env, pattern)),
       ContentSettingsPattern::Wildcard(),
       static_cast<ContentSettingsType>(content_settings_type),
       "",
       static_cast<ContentSetting>(setting));
 }
 
 static void GetContentSettingsExceptions(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj,
                                          int content_settings_type,
                                          const JavaParamRef<jobject>& list) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   ContentSettingsForOneType entries;
   host_content_settings_map->GetSettingsForOneType(
       static_cast<ContentSettingsType>(content_settings_type), "", &entries);
   for (size_t i = 0; i < entries.size(); ++i) {
     Java_PrefServiceBridge_addContentSettingExceptionToList(
         env, list,
         content_settings_type,
         ConvertUTF8ToJavaString(
             env, entries[i].primary_pattern.ToString()).obj(),
         ConvertUTF8ToJavaString(
@@ skipping 159 matching lines @@
 static jboolean GetAllowLocationEnabled(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
   return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
 static jboolean GetLocationAllowedByPolicy(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj) {
   if (!IsContentSettingManaged(CONTENT_SETTINGS_TYPE_GEOLOCATION))
     return false;
   HostContentSettingsMap* content_settings =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   return content_settings->GetDefaultContentSetting(
              CONTENT_SETTINGS_TYPE_GEOLOCATION, nullptr) ==
          CONTENT_SETTING_ALLOW;
 }
 
 static jboolean GetAllowLocationUserModifiable(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   return IsContentSettingUserModifiable(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
@@ skipping 53 matching lines @@
 }
 
 static jboolean GetFullscreenManaged(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
   return IsContentSettingManaged(CONTENT_SETTINGS_TYPE_FULLSCREEN);
 }
 
 static jboolean GetFullscreenAllowed(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
   HostContentSettingsMap* content_settings =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   return content_settings->GetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_FULLSCREEN, NULL) == CONTENT_SETTING_ALLOW;
 }
 
 static jboolean GetMetricsReportingEnabled(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj) {
   PrefService* local_state = g_browser_process->local_state();
   return local_state->GetBoolean(prefs::kMetricsReportingEnabled);
 }
 
@@ skipping 74 matching lines @@
 
 static jboolean CanDeleteBrowsingHistory(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
 }
 
 static void SetAllowCookiesEnabled(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj,
                                    jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_COOKIES,
       allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
 }
 
 static void SetBlockThirdPartyCookiesEnabled(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj,
                                              jboolean enabled) {
   GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
 }
@@ skipping 10 matching lines @@
     const JavaParamRef<jobject>& obj,
     jboolean enabled) {
   GetPrefService()->SetBoolean(
       password_manager::prefs::kPasswordManagerAutoSignin, enabled);
 }
 
 static void SetProtectedMediaIdentifierEnabled(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jboolean is_enabled) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
       is_enabled ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
 }
 
 static void SetAllowLocationEnabled(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
                                     jboolean is_enabled) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_GEOLOCATION,
       is_enabled ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
 }
 
 static void SetCameraEnabled(JNIEnv* env,
                              const JavaParamRef<jobject>& obj,
                              jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
       allow ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
 }
 
 static void SetMicEnabled(JNIEnv* env,
                           const JavaParamRef<jobject>& obj,
                           jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
       allow ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
 }
 
 static void SetFullscreenAllowed(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_FULLSCREEN,
       allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_ASK);
 }
 
 static void SetPushNotificationsEnabled(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj,
                                         jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
       allow ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
 }
 
 static void SetCrashReporting(JNIEnv* env,
                               const JavaParamRef<jobject>& obj,
                               jboolean reporting) {
   PrefService* local_state = g_browser_process->local_state();
   local_state->SetBoolean(prefs::kCrashReportingEnabled, reporting);
@@ skipping 123 matching lines @@
                                          const JavaParamRef<jobject>& obj) {
   return IsContentSettingManagedByCustodian(
              CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
 }
 
 static void SetJavaScriptAllowed(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  const JavaParamRef<jstring>& pattern,
                                  int setting) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetContentSetting(
       ContentSettingsPattern::FromString(ConvertJavaStringToUTF8(env, pattern)),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_JAVASCRIPT,
       "",
       static_cast<ContentSetting>(setting));
 }
 
 static void SetPopupException(JNIEnv* env,
                               const JavaParamRef<jobject>& obj,
                               const JavaParamRef<jstring>& pattern,
                               int setting) {
   HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetContentSetting(
       ContentSettingsPattern::FromString(ConvertJavaStringToUTF8(env, pattern)),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_POPUPS,
       "",
       static_cast<ContentSetting>(setting));
 }
 
 static void SetSearchSuggestEnabled(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
@@ skipping 165 matching lines @@
     ContentSettingsType content_type) {
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> android_permission =
       Java_PrefServiceBridge_getAndroidPermissionForContentSetting(
           env, content_type);
   if (android_permission.is_null())
     return std::string();
 
   return ConvertJavaStringToUTF8(android_permission);
 }