Remove DemuxerFactory and URL parameter from Pipeline.

webkit/media/preload.h

Index: webkit/media/preload.h
diff --git a/media/base/preload.h b/webkit/media/preload.h
similarity index 80%
rename from media/base/preload.h
rename to webkit/media/preload.h
index 136e84c261ebbb9a5ab98eef0722f24ee7e07d05..2643bc78ed3274368841127e7394159d8ffd10a8 100644
--- a/media/base/preload.h
+++ b/webkit/media/preload.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_PRELOAD_H_
-#define MEDIA_BASE_PRELOAD_H_
+#ifndef WEBKIT_MEDIA_PRELOAD_H_
+#define WEBKIT_MEDIA_PRELOAD_H_
 
-namespace media {
+namespace webkit_media {
 
 // Used to specify video preload states. They are "hints" to the browser about
 // how aggressively the browser should load and buffer data.
@@ -20,6 +20,6 @@ enum Preload {
   AUTO,
 };
 
-}  // namespace media
+}  // namespace webkit_media
 
-#endif  // MEDIA_BASE_PRELOAD_H_
+#endif  // WEBKIT_MEDIA_PRELOAD_H_