[android_view] Add MediaPlaybackRequiresUserGesture content setting.

Also add unit test which doesn't use the poll.

BUG=b/6842070
TBR=joi

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

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

1 files changed, 12 insertions, 0 deletions

diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc
index 45a4223..581a85f 100644
--- a/content/browser/android/content_settings.cc
+++ b/content/browser/android/content_settings.cc
@@ -86,6 +86,8 @@ struct ContentSettings::FieldIds {
         GetFieldID(env, clazz, "mUseWideViewport", "Z");
     load_with_overview_mode =
         GetFieldID(env, clazz, "mLoadWithOverviewMode", "Z");
+    media_playback_requires_user_gesture =
+        GetFieldID(env, clazz, "mMediaPlaybackRequiresUserGesture", "Z");
   }
 
   // Field ids
@@ -113,6 +115,7 @@ struct ContentSettings::FieldIds {
   jfieldID database_enabled;
   jfieldID use_wide_viewport;
   jfieldID load_with_overview_mode;
+  jfieldID media_playback_requires_user_gesture;
 };
 
 ContentSettings::ContentSettings(JNIEnv* env,
@@ -283,6 +286,12 @@ void ContentSettings::SyncFromNativeImpl() {
       obj,
       field_ids_->load_with_overview_mode,
       prefs.initialize_at_minimum_page_scale);
+
+  env->SetBooleanField(
+      obj,
+      field_ids_->media_playback_requires_user_gesture,
+      prefs.user_gesture_required_for_media_playback);
+
   CheckException(env);
 }
 
@@ -401,6 +410,9 @@ void ContentSettings::SyncToNativeImpl() {
   prefs.initialize_at_minimum_page_scale = env->GetBooleanField(
       obj, field_ids_->load_with_overview_mode);
 
+  prefs.user_gesture_required_for_media_playback = env->GetBooleanField(
+      obj, field_ids_->media_playback_requires_user_gesture);
+
   render_view_host->UpdateWebkitPreferences(prefs);
 }