Revert r95841 due to failing media_unittests on linux_shared bot.

media/filters/adaptive_demuxer.h

 // 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.
 
 // Implements a Demuxer that can switch among different data sources mid-stream.
 // Uses FFmpegDemuxer under the covers, so see the caveats at the top of
 // ffmpeg_demuxer.h.
 
 #ifndef MEDIA_FILTERS_ADAPTIVE_DEMUXER_H_
 #define MEDIA_FILTERS_ADAPTIVE_DEMUXER_H_
@@ skipping 224 matching lines @@
 
 // AdaptiveDemuxerFactory wraps an underlying DemuxerFactory that knows how to
 // build demuxers for a single URL, and implements a primitive (for now) version
 // of multi-file manifests.  The manifest is encoded in the |url| parameter to
 // Build() as:
 // x-adaptive:<initial_audio_index>:<initial_video_index>:<URL>[^<URL>]* where
 // <URL>'s are "real" media URLs which are passed to the underlying
 // DemuxerFactory's Build() method individually.  For backward-compatibility,
 // the manifest URL may also simply be a regular URL in which case an implicit
 // "x-adaptive:0:0:" is prepended.
-class MEDIA_EXPORT AdaptiveDemuxerFactory : public DemuxerFactory {
+class AdaptiveDemuxerFactory : public DemuxerFactory {
  public:
   // Takes a reference to |demuxer_factory|.
   AdaptiveDemuxerFactory(DemuxerFactory* delegate_factory);
   virtual ~AdaptiveDemuxerFactory();
 
   // DemuxerFactory methods.
   // If any of the underlying Demuxers encounter construction errors, only the
   // first one (in manifest order) will get reported back in |cb|.
   virtual void Build(const std::string& url, BuildCallback* cb);
   virtual DemuxerFactory* Clone() const;
 
  private:
   scoped_ptr<DemuxerFactory> delegate_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveDemuxerFactory);
 };
 
-// See AdaptiveDemuxerFactory's class-level comment for |url|'s format.
-MEDIA_EXPORT bool ParseAdaptiveUrl(
-    const std::string& url, int* audio_index, int* video_index,
-    std::vector<std::string>* urls);
-
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_ADAPTIVE_DEMUXER_H_