Collapse HTTP and non-HTTP codepaths into single methods.

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 447 matching lines @@
   Respond(response_generator_->GenerateFileResponse(-1));
 
   EXPECT_FALSE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, File_Successful) {
   InitializeWithFileResponse();
 
   EXPECT_TRUE(data_source_->loading());
+  EXPECT_FALSE(data_source_->IsStreaming());
   Stop();
 }
 
 static void SetTrue(bool* value) {
   *value = true;
 }
 
 // This test makes sure that Stop() does not require a task to run on
 // |message_loop_| before it calls its callback. This prevents accidental
 // introduction of a pipeline teardown deadlock. The pipeline owner blocks
@@ skipping 103 matching lines @@
   ReceiveData(kDataSize / 2);
 
   // Receive last half of the read but no buffering update.
   EXPECT_CALL(*this, ReadCallback(kDataSize));
   ReceiveData(kDataSize / 2);
 
   Stop();
 }
 
 }  // namespace webkit_media