Remove DemuxerFactory and URL parameter from Pipeline.

webkit/media/buffered_data_source_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "media/base/media_log.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_data_source_host.h"
 #include "media/base/mock_filters.h"
@@ skipping 144 matching lines @@
   }
 
   // Accessors for private variables on |data_source_|.
   BufferedResourceLoader* loader() {
     return data_source_->loader_.get();
   }
   WebURLLoader* url_loader() {
     return loader()->active_loader_->loader_.get();
   }
 
-  media::Preload preload() { return data_source_->preload_; }
+  Preload preload() { return data_source_->preload_; }
   BufferedResourceLoader::DeferStrategy defer_strategy() {
     return loader()->defer_strategy_;
   }
   int data_source_bitrate() { return data_source_->bitrate_; }
   int data_source_playback_rate() { return data_source_->playback_rate_; }
   int loader_bitrate() { return loader()->bitrate_; }
   int loader_playback_rate() { return loader()->playback_rate_; }
 
 
   scoped_refptr<MockBufferedDataSource> data_source_;
@@ skipping 188 matching lines @@
 
   // Verify that the callback was called inside the Stop() call.
   EXPECT_TRUE(stop_done_called);
   message_loop_->RunAllPending();
 }
 
 TEST_F(BufferedDataSourceTest, DefaultValues) {
   InitializeWith206Response();
 
   // Ensure we have sane values for default loading scenario.
-  EXPECT_EQ(media::AUTO, preload());
+  EXPECT_EQ(AUTO, preload());
   EXPECT_EQ(BufferedResourceLoader::kThresholdDefer, defer_strategy());
 
   EXPECT_EQ(0, data_source_bitrate());
   EXPECT_EQ(0.0f, data_source_playback_rate());
   EXPECT_EQ(0, loader_bitrate());
   EXPECT_EQ(0.0f, loader_playback_rate());
 
   EXPECT_TRUE(data_source_->loading());
   Stop();
 }
@@ skipping 62 matching lines @@
 
   // During teardown we'll also report our final network status.
   EXPECT_CALL(host_, SetNetworkActivity(false));
   EXPECT_CALL(host_, SetBufferedBytes(kDataSize));
 
   EXPECT_TRUE(data_source_->loading());
   Stop();
 }
 
 }  // namespace webkit_media