Revert of Rename kDisableGestureRequirementForMediaPlayback and make it a test-only flag.

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index e561f09f70605dc8a067a5d5e3036656800cc280..771cf948b3fe282a817f77e8b1b21efbff08afd5 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -97,7 +97,6 @@
 #include "extensions/common/constants.h"
 #include "extensions/features/features.h"
 #include "ipc/ipc_sync_channel.h"
-#include "media/base/media_switches.h"
 #include "media/media_features.h"
 #include "net/base/net_errors.h"
 #include "ppapi/c/private/ppb_pdf.h"
@@ -673,7 +672,7 @@
   // TODO(dalecurtis): Include an idle check too.  http://crbug.com/509135
   if ((render_frame->IsHidden() && !has_played_media_before &&
        !base::CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kIgnoreAutoplayRestrictionsForTests)) ||
+           switches::kDisableGestureRequirementForMediaPlayback)) ||
       prerender::PrerenderHelper::IsPrerendering(render_frame)) {
     new MediaLoadDeferrer(render_frame, closure);
     return;