| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1338 ReadAt(kDataSize + 10, kDataSize - 10); | 1338 ReadAt(kDataSize + 10, kDataSize - 10); |
| 1339 base::RunLoop run_loop; | 1339 base::RunLoop run_loop; |
| 1340 data_provider()->didFail(url_loader(), response_generator_->GenerateError()); | 1340 data_provider()->didFail(url_loader(), response_generator_->GenerateError()); |
| 1341 data_provider()->RunOnStart(run_loop.QuitClosure()); | 1341 data_provider()->RunOnStart(run_loop.QuitClosure()); |
| 1342 run_loop.Run(); | 1342 run_loop.Run(); |
| 1343 | 1343 |
| 1344 // Server responds with a redirect. | 1344 // Server responds with a redirect. |
| 1345 blink::WebURLRequest request((GURL(kHttpDifferentPathUrl))); | 1345 blink::WebURLRequest request((GURL(kHttpDifferentPathUrl))); |
| 1346 blink::WebURLResponse response((GURL(kHttpUrl))); | 1346 blink::WebURLResponse response((GURL(kHttpUrl))); |
| 1347 response.setHTTPStatusCode(307); | 1347 response.setHTTPStatusCode(307); |
| 1348 data_provider()->willFollowRedirect(url_loader(), request, response); | 1348 data_provider()->willFollowRedirect(url_loader(), request, response, 0); |
| 1349 Respond(response_generator_->Generate206(kDataSize)); | 1349 Respond(response_generator_->Generate206(kDataSize)); |
| 1350 ReceiveData(kDataSize); | 1350 ReceiveData(kDataSize); |
| 1351 EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 3)); | 1351 EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 3)); |
| 1352 FinishLoading(); | 1352 FinishLoading(); |
| 1353 EXPECT_FALSE(loading()); | 1353 EXPECT_FALSE(loading()); |
| 1354 Stop(); | 1354 Stop(); |
| 1355 } | 1355 } |
| 1356 | 1356 |
| 1357 TEST_F(MultibufferDataSourceTest, Http_NotStreamingAfterRedirect) { | 1357 TEST_F(MultibufferDataSourceTest, Http_NotStreamingAfterRedirect) { |
| 1358 Initialize(kHttpUrl, true); | 1358 Initialize(kHttpUrl, true); |
| 1359 | 1359 |
| 1360 // Server responds with a redirect. | 1360 // Server responds with a redirect. |
| 1361 blink::WebURLRequest request((GURL(kHttpDifferentPathUrl))); | 1361 blink::WebURLRequest request((GURL(kHttpDifferentPathUrl))); |
| 1362 blink::WebURLResponse response((GURL(kHttpUrl))); | 1362 blink::WebURLResponse response((GURL(kHttpUrl))); |
| 1363 response.setHTTPStatusCode(307); | 1363 response.setHTTPStatusCode(307); |
| 1364 data_provider()->willFollowRedirect(url_loader(), request, response); | 1364 data_provider()->willFollowRedirect(url_loader(), request, response, 0); |
| 1365 | 1365 |
| 1366 EXPECT_CALL(host_, SetTotalBytes(response_generator_->content_length())); | 1366 EXPECT_CALL(host_, SetTotalBytes(response_generator_->content_length())); |
| 1367 Respond(response_generator_->Generate206(0)); | 1367 Respond(response_generator_->Generate206(0)); |
| 1368 | 1368 |
| 1369 EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize)); | 1369 EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize)); |
| 1370 ReceiveData(kDataSize); | 1370 ReceiveData(kDataSize); |
| 1371 | 1371 |
| 1372 EXPECT_FALSE(data_source_->IsStreaming()); | 1372 EXPECT_FALSE(data_source_->IsStreaming()); |
| 1373 | 1373 |
| 1374 FinishLoading(); | 1374 FinishLoading(); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 1397 EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 2)); | 1397 EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 2)); |
| 1398 FinishLoading(); | 1398 FinishLoading(); |
| 1399 | 1399 |
| 1400 // Done loading, now we should know the length. | 1400 // Done loading, now we should know the length. |
| 1401 EXPECT_TRUE(data_source_->GetSize(&len)); | 1401 EXPECT_TRUE(data_source_->GetSize(&len)); |
| 1402 EXPECT_EQ(kDataSize, len); | 1402 EXPECT_EQ(kDataSize, len); |
| 1403 Stop(); | 1403 Stop(); |
| 1404 } | 1404 } |
| 1405 | 1405 |
| 1406 } // namespace media | 1406 } // namespace media |
| OLD | NEW |