Add a HostContentSettingsMap layer for Supervised Users.

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"
@@ skipping 86 matching lines @@
 bool IsContentSettingManaged(ContentSettingsType content_settings_type) {
   std::string source;
   HostContentSettingsMap* content_settings =
       GetOriginalProfile()->GetHostContentSettingsMap();
   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();
+  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();
   content_settings->GetDefaultContentSetting(content_settings_type, &source);
   HostContentSettingsMap::ProviderType provider =
       content_settings->GetProviderTypeFromSource(source);
   return provider >= HostContentSettingsMap::PREF_PROVIDER;
 }
 
@@ skipping 106 matching lines @@
          GetPrefService()->GetBoolean(prefs::kGeolocationEnabled);
 }
 
 static jboolean GetAllowLocationUserModifiable(JNIEnv* env, jobject obj) {
   return IsContentSettingUserModifiable(CONTENT_SETTINGS_TYPE_GEOLOCATION) &&
          GetPrefService()->IsUserModifiablePreference(
              prefs::kGeolocationEnabled);
 }
 
 static jboolean GetAllowLocationManagedByCustodian(JNIEnv* env, jobject obj) {
-  return GetPrefService()->IsPreferenceManagedByCustodian(
-      prefs::kGeolocationEnabled);
+  return IsContentSettingManagedByCustodian(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
 static jboolean GetResolveNavigationErrorEnabled(JNIEnv* env, jobject obj) {
   return GetPrefService()->GetBoolean(prefs::kAlternateErrorPagesEnabled);
 }
 
 static jboolean GetResolveNavigationErrorManaged(JNIEnv* env, jobject obj) {
   return GetPrefService()->IsManagedPreference(
       prefs::kAlternateErrorPagesEnabled);
 }
@@ skipping 175 matching lines @@
       enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
 }
 
 static jboolean GetJavaScriptEnabled(JNIEnv* env, jobject obj) {
   return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
 }
 
 static void MigrateJavascriptPreference(JNIEnv* env, jobject obj) {
   const PrefService::Preference* javascript_pref =
       GetPrefService()->FindPreference(prefs::kWebKitJavascriptEnabled);
   DCHECK(javascript_pref);

[Bernhard Bauer, 2015/02/26 12:44:57]

If |javascript_pref| is indeed null, you will crash on the next line anyway.

 
   if (!javascript_pref->HasUserSetting())
     return;
 
   bool javascript_enabled = false;
   bool retval = javascript_pref->GetValue()->GetAsBoolean(&javascript_enabled);
   DCHECK(retval);
   SetJavaScriptEnabled(env, obj, javascript_enabled);

[Bernhard Bauer, 2015/02/26 12:44:57]

Is this going to work for user-defined preferences? A default content setting
can be overridden by exceptions. Is there even a place where this pref is set on
the user level?

   GetPrefService()->ClearPref(prefs::kWebKitJavascriptEnabled);
 }
 
 static void SetPasswordEchoEnabled(JNIEnv* env,
                                    jobject obj,
                                    jboolean passwordEchoEnabled) {
   GetPrefService()->SetBoolean(prefs::kWebKitPasswordEchoEnabled,
                                passwordEchoEnabled);
 }
 
@@ skipping 21 matching lines @@
 }
 
 static jboolean GetCameraMicUserModifiable(JNIEnv* env, jobject obj) {
   PrefService* prefs = GetPrefService();
   return IsContentSettingUserModifiable(CONTENT_SETTINGS_TYPE_MEDIASTREAM) &&
          prefs->IsUserModifiablePreference(prefs::kAudioCaptureAllowed) &&
          prefs->IsUserModifiablePreference(prefs::kVideoCaptureAllowed);
 }
 
 static jboolean GetCameraMicManagedByCustodian(JNIEnv* env, jobject obj) {
-  PrefService* prefs = GetPrefService();
-  if (prefs->IsPreferenceManagedByCustodian(prefs::kVideoCaptureAllowed))
-    return true;
-  if (prefs->IsPreferenceManagedByCustodian(prefs::kAudioCaptureAllowed))
-    return true;
-  return false;
+  return IsContentSettingManagedByCustodian(CONTENT_SETTINGS_TYPE_MEDIASTREAM);
 }
 
 static jboolean GetAutologinEnabled(JNIEnv* env, jobject obj) {
   return GetPrefService()->GetBoolean(prefs::kAutologinEnabled);
 }
 
 static void SetAutologinEnabled(JNIEnv* env, jobject obj,
                                 jboolean autologinEnabled) {
   GetPrefService()->SetBoolean(prefs::kAutologinEnabled, autologinEnabled);
 }
@@ skipping 212 matching lines @@
                                                                jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
       GetPrefService()->GetString(
           prefs::kSupervisedUserSecondCustodianProfileImageURL)).Release();
 }
 
 bool RegisterPrefServiceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }