Make autoplay policies no longer platform dependant.

chrome/browser/android/voice_search_tab_helper.cc

Index: chrome/browser/android/voice_search_tab_helper.cc
diff --git a/chrome/browser/android/voice_search_tab_helper.cc b/chrome/browser/android/voice_search_tab_helper.cc
index 417741647ac0ad134bfda791e2566f855e29b983..7389c448f33bc3eb3c04703161a394475422f2c5 100644
--- a/chrome/browser/android/voice_search_tab_helper.cc
+++ b/chrome/browser/android/voice_search_tab_helper.cc
@@ -17,11 +17,11 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(VoiceSearchTabHelper);
 // requirements like this.
 VoiceSearchTabHelper::VoiceSearchTabHelper(content::WebContents* contents)
     : content::WebContentsObserver(contents) {
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
   gesture_requirement_for_playback_disabled_ =
-      command_line->HasSwitch(switches::kIgnoreAutoplayRestrictionsForTests) ||
-      command_line->GetSwitchValueASCII(switches::kAutoplayPolicy) !=
-          switches::autoplay::kNoUserGestureRequiredPolicy;
+      media::GetEffectiveAutoplayPolicy(*command_line) ==
+      switches::autoplay::kNoUserGestureRequiredPolicy;
 }
 
 VoiceSearchTabHelper::~VoiceSearchTabHelper() {
@@ -39,11 +39,17 @@ void VoiceSearchTabHelper::NavigationEntryCommitted(
 
   bool gesture_required =
       !google_util::IsGoogleSearchUrl(web_contents()->GetLastCommittedURL());
+  bool gesture_required_by_prefs =
+      prefs.autoplay_policy == content::AutoplayPolicy::kUserGestureRequired;
 
-  if (gesture_required != prefs.user_gesture_required_for_media_playback) {
+  if (gesture_required != gesture_required_by_prefs) {
     // TODO(chrishtr): this is wrong. user_gesture_required_for_media_playback
     // will be reset the next time a preference changes.
-    prefs.user_gesture_required_for_media_playback = gesture_required;
+    // TODO(mlamouri): this is even more wrong because it makes assumptions with
+    // regards to the default autoplay policy.
+    prefs.autoplay_policy =
+        gesture_required ? content::AutoplayPolicy::kUserGestureRequired
+                         : content::AutoplayPolicy::kNoUserGestureRequired;
     host->UpdateWebkitPreferences(prefs);
   }
 }