4 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 864f8b3..1fa4d36 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -705,6 +705,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDomAutomationController,
     switches::kDumpHistogramsOnExit,
     switches::kEnableAcceleratedDecoding,
+    switches::kEnableAdaptive,
     switches::kEnableBenchmarking,
     switches::kEnableClickToPlay,
     switches::kEnableCrxlessWebApps,
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index ee47bb3..92c7019 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -16,6 +16,9 @@ const char kAlsaInputDevice[] = "alsa-input-device";
 // Enable hardware decoding through gpu process.
 const char kEnableAcceleratedDecoding[]  = "enable-accelerated-decoding";
 
+// Enable x-adaptive URL scheme.
+const char kEnableAdaptive[] = "enable-adaptive";
+
 // Enable hardware decoding using OpenMax API.
 // In practice this is for ChromeOS ARM.
 const char kEnableOpenMax[] = "enable-openmax";
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index 67aa4f1..5fb98f2 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -17,6 +17,7 @@ extern const char kAlsaInputDevice[];
 #endif
 
 extern const char kEnableAcceleratedDecoding[];
+extern const char kEnableAdaptive[];
 extern const char kEnableOpenMax[];
 extern const char kVideoThreads[];
 
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 54bc600..527a297 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -16,6 +16,7 @@
 #include "media/base/media_switches.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/video_frame.h"
+#include "media/filters/adaptive_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer_factory.h"
 #include "media/filters/ffmpeg_video_decoder.h"
@@ -343,6 +344,10 @@ bool WebMediaPlayerImpl::Initialize(
   scoped_ptr<media::DemuxerFactory> demuxer_factory(
       new media::FFmpegDemuxerFactory(data_source_factory.release(),
                                       pipeline_message_loop));
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAdaptive)) {
+    demuxer_factory.reset(new media::AdaptiveDemuxerFactory(
+        demuxer_factory.release()));
+  }
   filter_collection_->SetDemuxerFactory(demuxer_factory.release());
 
   // Add in the default filter factories.