Reduce unnecessary network connections.

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 "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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 184 matching lines @@
   EXPECT_CALL(host_, SetTotalBytes(response_generator_.content_length()));
   EXPECT_CALL(host_, SetBufferedBytes(0));
   Respond(response_generator_.Generate206(0));
 
   EXPECT_TRUE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Range_NotFound) {
   Initialize(media::PIPELINE_ERROR_NETWORK);
-
-  // It'll try again.
-  //
-  // TODO(scherkus): don't try again on errors http://crbug.com/105230
-  ExpectCreateResourceLoader();
-  Respond(response_generator_.Generate404());
-
-  // Now it's done and will fail.
   Respond(response_generator_.Generate404());
 
   EXPECT_FALSE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Range_NotSupported) {
   Initialize(media::PIPELINE_OK);
-
-  // It'll try again.
-  //
-  // TODO(scherkus): try to reuse existing connection http://crbug.com/104783
-  ExpectCreateResourceLoader();
-  Respond(response_generator_.Generate200());
-
-  // Now it'll succeed.
   EXPECT_CALL(host_, SetTotalBytes(response_generator_.content_length()));
   EXPECT_CALL(host_, SetBufferedBytes(0));
   Respond(response_generator_.Generate200());
 
   EXPECT_TRUE(data_source_->loading());
   EXPECT_TRUE(data_source_->IsStreaming());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Range_MissingContentRange) {
   Initialize(media::PIPELINE_ERROR_NETWORK);
-
-  // It'll try again.
-  //
-  // TODO(scherkus): don't try again on errors http://crbug.com/105230
-  ExpectCreateResourceLoader();
   Respond(response_generator_.Generate206(
       0, TestResponseGenerator::kNoContentRange));
 
-  // Now it's done and will fail.
-  Respond(response_generator_.Generate206(
-      0, TestResponseGenerator::kNoContentRange));
-
   EXPECT_FALSE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Range_MissingContentLength) {
   Initialize(media::PIPELINE_OK);
 
   // It'll manage without a Content-Length response.
   EXPECT_CALL(host_, SetTotalBytes(response_generator_.content_length()));
   EXPECT_CALL(host_, SetBufferedBytes(0));
   Respond(response_generator_.Generate206(
       0, TestResponseGenerator::kNoContentLength));
 
   EXPECT_TRUE(data_source_->loading());
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Range_WrongContentRange) {
   Initialize(media::PIPELINE_ERROR_NETWORK);
 
-  // It'll try again.
-  //
-  // TODO(scherkus): don't try again on errors http://crbug.com/105230
-  ExpectCreateResourceLoader();
-  Respond(response_generator_.Generate206(1337));
-
   // Now it's done and will fail.
   Respond(response_generator_.Generate206(1337));
 
   EXPECT_FALSE(data_source_->loading());
   Stop();
 }
 
 // Test the case where the initial response from the server indicates that
 // Range requests are supported, but a later request prove otherwise.
 TEST_F(BufferedDataSourceTest, Range_ServerLied) {
@@ skipping 158 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