[Android, Media] Enable autoplay settings for muted autoplay, wired them up to the media element.

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 3691 matching lines @@
 }
 
 bool HTMLMediaElement::isGestureNeededForPlayback() const
 {
     if (!m_lockedPendingUserGesture)
         return false;
 
     // We want to allow muted video to autoplay if:
     // - the flag is enabled;
     // - Data Saver is not enabled;
-    if (muted() && RuntimeEnabledFeatures::autoplayMutedVideosEnabled()
-        && !(document().settings() && document().settings()->dataSaverEnabled())) {
+    // - Autoplay is enabled in settings;
+    if (muted()
+        && RuntimeEnabledFeatures::autoplayMutedVideosEnabled()
+        && !(document().settings() && document().settings()->dataSaverEnabled())
+        && isAutoplayAllowedPerSettings()) {
         return false;
     }
 
     if (m_autoplayHelper->isGestureRequirementOverridden())
         return false;
 
     return true;
 }
 
+bool HTMLMediaElement::isAutoplayAllowedPerSettings() const
+{
+    LocalFrame* frame = document().frame();
+    if (!frame)
+        return false;
+    FrameLoaderClient* frameLoaderClient = frame->loader().client();
+    return frameLoaderClient && frameLoaderClient->allowAutoplay(false);
+}
+
 void HTMLMediaElement::setNetworkState(NetworkState state)
 {
     if (m_networkState != state) {
         m_networkState = state;
         if (MediaControls* controls = mediaControls())
             controls->networkStateChanged();
     }
 }
 
 void HTMLMediaElement::notifyPositionMayHaveChanged(const IntRect& visibleRect)
@@ skipping 219 matching lines @@
 {
     String mode;
     if (m_element->document().settings())
         mode = m_element->document().settings()->autoplayExperimentMode();
 
     return mode;
 }
 
 bool HTMLMediaElement::AutoplayHelperClientImpl::isAutoplayAllowedPerSettings() const
 {
-    LocalFrame* frame = m_element->document().frame();
-    if (!frame)
-        return false;
-    FrameLoaderClient* frameLoaderClient = frame->loader().client();
-    return frameLoaderClient && frameLoaderClient->allowAutoplay(false);
+    return m_element->isAutoplayAllowedPerSettings();
 }
 
 void HTMLMediaElement::AutoplayHelperClientImpl::setRequestPositionUpdates(bool request)
 {
     if (LayoutObject* layoutObject = m_element->layoutObject()) {
         LayoutMediaItem layoutMediaItem = LayoutMediaItem(toLayoutMedia(layoutObject));
         layoutMediaItem.setRequestPositionUpdates(request);
     }
 }
 
 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() const
 {
     IntRect result;
     if (LayoutObject* object = m_element->layoutObject())
         result = object->absoluteBoundingBoxRect();
     return result;
 }
 
 } // namespace blink