OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
11 #include "base/files/scoped_temp_dir.h" | 11 #include "base/files/scoped_temp_dir.h" |
12 #include "base/memory/scoped_vector.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
15 #include "base/strings/string_piece.h" | 15 #include "base/strings/string_piece.h" |
16 #include "base/test/test_file_util.h" | 16 #include "base/test/test_file_util.h" |
17 #include "base/thread_task_runner_handle.h" | 17 #include "base/thread_task_runner_handle.h" |
18 #include "net/base/auth.h" | 18 #include "net/base/auth.h" |
19 #include "net/base/chunked_upload_data_stream.h" | 19 #include "net/base/chunked_upload_data_stream.h" |
20 #include "net/base/elements_upload_data_stream.h" | 20 #include "net/base/elements_upload_data_stream.h" |
21 #include "net/base/request_priority.h" | 21 #include "net/base/request_priority.h" |
22 #include "net/base/test_data_directory.h" | 22 #include "net/base/test_data_directory.h" |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 get_request_.url = GURL(GetDefaultUrl()); | 453 get_request_.url = GURL(GetDefaultUrl()); |
454 get_request_.load_flags = 0; | 454 get_request_.load_flags = 0; |
455 get_request_.extra_headers.SetHeader("User-Agent", "Chrome"); | 455 get_request_.extra_headers.SetHeader("User-Agent", "Chrome"); |
456 get_request_initialized_ = true; | 456 get_request_initialized_ = true; |
457 } | 457 } |
458 return get_request_; | 458 return get_request_; |
459 } | 459 } |
460 | 460 |
461 const HttpRequestInfo& CreatePostRequest() { | 461 const HttpRequestInfo& CreatePostRequest() { |
462 if (!post_request_initialized_) { | 462 if (!post_request_initialized_) { |
463 ScopedVector<UploadElementReader> element_readers; | 463 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
464 element_readers.push_back( | 464 element_readers.push_back(make_scoped_ptr( |
465 new UploadBytesElementReader(kUploadData, kUploadDataSize)); | 465 new UploadBytesElementReader(kUploadData, kUploadDataSize))); |
466 upload_data_stream_.reset( | 466 upload_data_stream_.reset( |
467 new ElementsUploadDataStream(element_readers.Pass(), 0)); | 467 new ElementsUploadDataStream(std::move(element_readers), 0)); |
468 | 468 |
469 post_request_.method = "POST"; | 469 post_request_.method = "POST"; |
470 post_request_.url = GURL(GetDefaultUrl()); | 470 post_request_.url = GURL(GetDefaultUrl()); |
471 post_request_.upload_data_stream = upload_data_stream_.get(); | 471 post_request_.upload_data_stream = upload_data_stream_.get(); |
472 post_request_initialized_ = true; | 472 post_request_initialized_ = true; |
473 } | 473 } |
474 return post_request_; | 474 return post_request_; |
475 } | 475 } |
476 | 476 |
477 const HttpRequestInfo& CreateFilePostRequest() { | 477 const HttpRequestInfo& CreateFilePostRequest() { |
478 if (!post_request_initialized_) { | 478 if (!post_request_initialized_) { |
479 base::FilePath file_path; | 479 base::FilePath file_path; |
480 CHECK(base::CreateTemporaryFileInDir(temp_dir_.path(), &file_path)); | 480 CHECK(base::CreateTemporaryFileInDir(temp_dir_.path(), &file_path)); |
481 CHECK_EQ(static_cast<int>(kUploadDataSize), | 481 CHECK_EQ(static_cast<int>(kUploadDataSize), |
482 base::WriteFile(file_path, kUploadData, kUploadDataSize)); | 482 base::WriteFile(file_path, kUploadData, kUploadDataSize)); |
483 | 483 |
484 ScopedVector<UploadElementReader> element_readers; | 484 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
485 element_readers.push_back(new UploadFileElementReader( | 485 element_readers.push_back(make_scoped_ptr(new UploadFileElementReader( |
486 base::ThreadTaskRunnerHandle::Get().get(), file_path, 0, | 486 base::ThreadTaskRunnerHandle::Get().get(), file_path, 0, |
487 kUploadDataSize, base::Time())); | 487 kUploadDataSize, base::Time()))); |
488 upload_data_stream_.reset( | 488 upload_data_stream_.reset( |
489 new ElementsUploadDataStream(element_readers.Pass(), 0)); | 489 new ElementsUploadDataStream(std::move(element_readers), 0)); |
490 | 490 |
491 post_request_.method = "POST"; | 491 post_request_.method = "POST"; |
492 post_request_.url = GURL(GetDefaultUrl()); | 492 post_request_.url = GURL(GetDefaultUrl()); |
493 post_request_.upload_data_stream = upload_data_stream_.get(); | 493 post_request_.upload_data_stream = upload_data_stream_.get(); |
494 post_request_initialized_ = true; | 494 post_request_initialized_ = true; |
495 } | 495 } |
496 return post_request_; | 496 return post_request_; |
497 } | 497 } |
498 | 498 |
499 const HttpRequestInfo& CreateUnreadableFilePostRequest() { | 499 const HttpRequestInfo& CreateUnreadableFilePostRequest() { |
500 if (post_request_initialized_) | 500 if (post_request_initialized_) |
501 return post_request_; | 501 return post_request_; |
502 | 502 |
503 base::FilePath file_path; | 503 base::FilePath file_path; |
504 CHECK(base::CreateTemporaryFileInDir(temp_dir_.path(), &file_path)); | 504 CHECK(base::CreateTemporaryFileInDir(temp_dir_.path(), &file_path)); |
505 CHECK_EQ(static_cast<int>(kUploadDataSize), | 505 CHECK_EQ(static_cast<int>(kUploadDataSize), |
506 base::WriteFile(file_path, kUploadData, kUploadDataSize)); | 506 base::WriteFile(file_path, kUploadData, kUploadDataSize)); |
507 CHECK(base::MakeFileUnreadable(file_path)); | 507 CHECK(base::MakeFileUnreadable(file_path)); |
508 | 508 |
509 ScopedVector<UploadElementReader> element_readers; | 509 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
510 element_readers.push_back(new UploadFileElementReader( | 510 element_readers.push_back(make_scoped_ptr(new UploadFileElementReader( |
511 base::ThreadTaskRunnerHandle::Get().get(), file_path, 0, | 511 base::ThreadTaskRunnerHandle::Get().get(), file_path, 0, |
512 kUploadDataSize, base::Time())); | 512 kUploadDataSize, base::Time()))); |
513 upload_data_stream_.reset( | 513 upload_data_stream_.reset( |
514 new ElementsUploadDataStream(element_readers.Pass(), 0)); | 514 new ElementsUploadDataStream(std::move(element_readers), 0)); |
515 | 515 |
516 post_request_.method = "POST"; | 516 post_request_.method = "POST"; |
517 post_request_.url = GURL(GetDefaultUrl()); | 517 post_request_.url = GURL(GetDefaultUrl()); |
518 post_request_.upload_data_stream = upload_data_stream_.get(); | 518 post_request_.upload_data_stream = upload_data_stream_.get(); |
519 post_request_initialized_ = true; | 519 post_request_initialized_ = true; |
520 return post_request_; | 520 return post_request_; |
521 } | 521 } |
522 | 522 |
523 const HttpRequestInfo& CreateComplexPostRequest() { | 523 const HttpRequestInfo& CreateComplexPostRequest() { |
524 if (!post_request_initialized_) { | 524 if (!post_request_initialized_) { |
525 const int kFileRangeOffset = 1; | 525 const int kFileRangeOffset = 1; |
526 const int kFileRangeLength = 3; | 526 const int kFileRangeLength = 3; |
527 CHECK_LT(kFileRangeOffset + kFileRangeLength, kUploadDataSize); | 527 CHECK_LT(kFileRangeOffset + kFileRangeLength, kUploadDataSize); |
528 | 528 |
529 base::FilePath file_path; | 529 base::FilePath file_path; |
530 CHECK(base::CreateTemporaryFileInDir(temp_dir_.path(), &file_path)); | 530 CHECK(base::CreateTemporaryFileInDir(temp_dir_.path(), &file_path)); |
531 CHECK_EQ(static_cast<int>(kUploadDataSize), | 531 CHECK_EQ(static_cast<int>(kUploadDataSize), |
532 base::WriteFile(file_path, kUploadData, kUploadDataSize)); | 532 base::WriteFile(file_path, kUploadData, kUploadDataSize)); |
533 | 533 |
534 ScopedVector<UploadElementReader> element_readers; | 534 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
535 element_readers.push_back( | 535 element_readers.push_back(make_scoped_ptr( |
536 new UploadBytesElementReader(kUploadData, kFileRangeOffset)); | 536 new UploadBytesElementReader(kUploadData, kFileRangeOffset))); |
537 element_readers.push_back(new UploadFileElementReader( | 537 element_readers.push_back(make_scoped_ptr(new UploadFileElementReader( |
538 base::ThreadTaskRunnerHandle::Get().get(), file_path, | 538 base::ThreadTaskRunnerHandle::Get().get(), file_path, |
539 kFileRangeOffset, kFileRangeLength, base::Time())); | 539 kFileRangeOffset, kFileRangeLength, base::Time()))); |
540 element_readers.push_back(new UploadBytesElementReader( | 540 element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
541 kUploadData + kFileRangeOffset + kFileRangeLength, | 541 kUploadData + kFileRangeOffset + kFileRangeLength, |
542 kUploadDataSize - (kFileRangeOffset + kFileRangeLength))); | 542 kUploadDataSize - (kFileRangeOffset + kFileRangeLength)))); |
543 upload_data_stream_.reset( | 543 upload_data_stream_.reset( |
544 new ElementsUploadDataStream(element_readers.Pass(), 0)); | 544 new ElementsUploadDataStream(std::move(element_readers), 0)); |
545 | 545 |
546 post_request_.method = "POST"; | 546 post_request_.method = "POST"; |
547 post_request_.url = GURL(GetDefaultUrl()); | 547 post_request_.url = GURL(GetDefaultUrl()); |
548 post_request_.upload_data_stream = upload_data_stream_.get(); | 548 post_request_.upload_data_stream = upload_data_stream_.get(); |
549 post_request_initialized_ = true; | 549 post_request_initialized_ = true; |
550 } | 550 } |
551 return post_request_; | 551 return post_request_; |
552 } | 552 } |
553 | 553 |
554 const HttpRequestInfo& CreateChunkedPostRequest() { | 554 const HttpRequestInfo& CreateChunkedPostRequest() { |
(...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1941 TransactionHelperResult out = helper.output(); | 1941 TransactionHelperResult out = helper.output(); |
1942 EXPECT_EQ(OK, out.rv); | 1942 EXPECT_EQ(OK, out.rv); |
1943 EXPECT_EQ("HTTP/1.1 200 OK", out.status_line); | 1943 EXPECT_EQ("HTTP/1.1 200 OK", out.status_line); |
1944 EXPECT_EQ("hello!", out.response_data); | 1944 EXPECT_EQ("hello!", out.response_data); |
1945 } | 1945 } |
1946 | 1946 |
1947 // Test that a simple POST works. | 1947 // Test that a simple POST works. |
1948 TEST_P(SpdyNetworkTransactionTest, EmptyPost) { | 1948 TEST_P(SpdyNetworkTransactionTest, EmptyPost) { |
1949 BufferedSpdyFramer framer(spdy_util_.spdy_version(), false); | 1949 BufferedSpdyFramer framer(spdy_util_.spdy_version(), false); |
1950 // Create an empty UploadDataStream. | 1950 // Create an empty UploadDataStream. |
1951 ScopedVector<UploadElementReader> element_readers; | 1951 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
1952 ElementsUploadDataStream stream(element_readers.Pass(), 0); | 1952 ElementsUploadDataStream stream(std::move(element_readers), 0); |
1953 | 1953 |
1954 // Setup the request | 1954 // Setup the request |
1955 HttpRequestInfo request; | 1955 HttpRequestInfo request; |
1956 request.method = "POST"; | 1956 request.method = "POST"; |
1957 request.url = GURL(GetDefaultUrl()); | 1957 request.url = GURL(GetDefaultUrl()); |
1958 request.upload_data_stream = &stream; | 1958 request.upload_data_stream = &stream; |
1959 | 1959 |
1960 const uint64 kContentLength = 0; | 1960 const uint64 kContentLength = 0; |
1961 | 1961 |
1962 scoped_ptr<SpdyHeaderBlock> req_block( | 1962 scoped_ptr<SpdyHeaderBlock> req_block( |
(...skipping 3875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5838 CreateMockRead(*window_update, 8), // kDeltaWindowSize * 4 | 5838 CreateMockRead(*window_update, 8), // kDeltaWindowSize * 4 |
5839 CreateMockRead(*window_update, 9), | 5839 CreateMockRead(*window_update, 9), |
5840 CreateMockRead(*resp, 10), | 5840 CreateMockRead(*resp, 10), |
5841 CreateMockRead(*body_end, 11), | 5841 CreateMockRead(*body_end, 11), |
5842 MockRead(ASYNC, 0, 0, 12) // EOF | 5842 MockRead(ASYNC, 0, 0, 12) // EOF |
5843 }; | 5843 }; |
5844 | 5844 |
5845 DeterministicSocketData data(reads, arraysize(reads), | 5845 DeterministicSocketData data(reads, arraysize(reads), |
5846 writes, arraysize(writes)); | 5846 writes, arraysize(writes)); |
5847 | 5847 |
5848 ScopedVector<UploadElementReader> element_readers; | 5848 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
5849 for (int i = 0; i < kFrameCount; ++i) { | 5849 for (int i = 0; i < kFrameCount; ++i) { |
5850 element_readers.push_back( | 5850 element_readers.push_back(make_scoped_ptr( |
5851 new UploadBytesElementReader(content->c_str(), content->size())); | 5851 new UploadBytesElementReader(content->c_str(), content->size()))); |
5852 } | 5852 } |
5853 ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); | 5853 ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
5854 | 5854 |
5855 // Setup the request | 5855 // Setup the request |
5856 HttpRequestInfo request; | 5856 HttpRequestInfo request; |
5857 request.method = "POST"; | 5857 request.method = "POST"; |
5858 request.url = GURL(GetDefaultUrl()); | 5858 request.url = GURL(GetDefaultUrl()); |
5859 request.upload_data_stream = &upload_data_stream; | 5859 request.upload_data_stream = &upload_data_stream; |
5860 | 5860 |
5861 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, | 5861 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, |
5862 BoundNetLog(), GetParam(), NULL); | 5862 BoundNetLog(), GetParam(), NULL); |
5863 helper.SetDeterministic(); | 5863 helper.SetDeterministic(); |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6052 scoped_ptr<SpdyFrame> window_update( | 6052 scoped_ptr<SpdyFrame> window_update( |
6053 spdy_util_.ConstructSpdyWindowUpdate(1, kDeltaWindowSize)); | 6053 spdy_util_.ConstructSpdyWindowUpdate(1, kDeltaWindowSize)); |
6054 MockRead reads[] = { | 6054 MockRead reads[] = { |
6055 CreateMockRead(*window_update, 1), | 6055 CreateMockRead(*window_update, 1), |
6056 MockRead(ASYNC, 0, 4) // EOF | 6056 MockRead(ASYNC, 0, 4) // EOF |
6057 }; | 6057 }; |
6058 | 6058 |
6059 DeterministicSocketData data(reads, arraysize(reads), | 6059 DeterministicSocketData data(reads, arraysize(reads), |
6060 writes, arraysize(writes)); | 6060 writes, arraysize(writes)); |
6061 | 6061 |
6062 ScopedVector<UploadElementReader> element_readers; | 6062 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
6063 for (int i = 0; i < kFrameCount; ++i) { | 6063 for (int i = 0; i < kFrameCount; ++i) { |
6064 element_readers.push_back( | 6064 element_readers.push_back(make_scoped_ptr( |
6065 new UploadBytesElementReader(content->c_str(), content->size())); | 6065 new UploadBytesElementReader(content->c_str(), content->size()))); |
6066 } | 6066 } |
6067 ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); | 6067 ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
6068 | 6068 |
6069 // Setup the request | 6069 // Setup the request |
6070 HttpRequestInfo request; | 6070 HttpRequestInfo request; |
6071 request.method = "POST"; | 6071 request.method = "POST"; |
6072 request.url = GURL(GetDefaultUrl()); | 6072 request.url = GURL(GetDefaultUrl()); |
6073 request.upload_data_stream = &upload_data_stream; | 6073 request.upload_data_stream = &upload_data_stream; |
6074 | 6074 |
6075 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, | 6075 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, |
6076 BoundNetLog(), GetParam(), NULL); | 6076 BoundNetLog(), GetParam(), NULL); |
6077 helper.SetDeterministic(); | 6077 helper.SetDeterministic(); |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6160 CreateMockRead(*window_update, i + 3), | 6160 CreateMockRead(*window_update, i + 3), |
6161 // Now the last write will occur. | 6161 // Now the last write will occur. |
6162 CreateMockRead(*reply, i + 5), | 6162 CreateMockRead(*reply, i + 5), |
6163 CreateMockRead(*body2, i + 6), | 6163 CreateMockRead(*body2, i + 6), |
6164 CreateMockRead(*body3, i + 7), | 6164 CreateMockRead(*body3, i + 7), |
6165 MockRead(ASYNC, 0, i + 8) // EOF | 6165 MockRead(ASYNC, 0, i + 8) // EOF |
6166 }; | 6166 }; |
6167 | 6167 |
6168 SequencedSocketData data(reads, arraysize(reads), writes.get(), num_writes); | 6168 SequencedSocketData data(reads, arraysize(reads), writes.get(), num_writes); |
6169 | 6169 |
6170 ScopedVector<UploadElementReader> element_readers; | 6170 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
6171 std::string upload_data_string(initial_window_size, 'a'); | 6171 std::string upload_data_string(initial_window_size, 'a'); |
6172 upload_data_string.append(kUploadData, kUploadDataSize); | 6172 upload_data_string.append(kUploadData, kUploadDataSize); |
6173 element_readers.push_back(new UploadBytesElementReader( | 6173 element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
6174 upload_data_string.c_str(), upload_data_string.size())); | 6174 upload_data_string.c_str(), upload_data_string.size()))); |
6175 ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); | 6175 ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
6176 | 6176 |
6177 HttpRequestInfo request; | 6177 HttpRequestInfo request; |
6178 request.method = "POST"; | 6178 request.method = "POST"; |
6179 request.url = GURL(GetDefaultUrl()); | 6179 request.url = GURL(GetDefaultUrl()); |
6180 request.upload_data_stream = &upload_data_stream; | 6180 request.upload_data_stream = &upload_data_stream; |
6181 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, | 6181 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, |
6182 BoundNetLog(), GetParam(), NULL); | 6182 BoundNetLog(), GetParam(), NULL); |
6183 helper.AddData(&data); | 6183 helper.AddData(&data); |
6184 helper.RunPreTestSetup(); | 6184 helper.RunPreTestSetup(); |
6185 | 6185 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6275 reads.push_back(CreateMockRead(*reply, i++)); | 6275 reads.push_back(CreateMockRead(*reply, i++)); |
6276 reads.push_back(CreateMockRead(*body2, i++)); | 6276 reads.push_back(CreateMockRead(*body2, i++)); |
6277 reads.push_back(CreateMockRead(*body3, i++)); | 6277 reads.push_back(CreateMockRead(*body3, i++)); |
6278 reads.push_back(MockRead(ASYNC, 0, i++)); // EOF | 6278 reads.push_back(MockRead(ASYNC, 0, i++)); // EOF |
6279 | 6279 |
6280 // Force all writes to happen before any read, last write will not | 6280 // Force all writes to happen before any read, last write will not |
6281 // actually queue a frame, due to window size being 0. | 6281 // actually queue a frame, due to window size being 0. |
6282 DeterministicSocketData data(vector_as_array(&reads), reads.size(), | 6282 DeterministicSocketData data(vector_as_array(&reads), reads.size(), |
6283 vector_as_array(&writes), writes.size()); | 6283 vector_as_array(&writes), writes.size()); |
6284 | 6284 |
6285 ScopedVector<UploadElementReader> element_readers; | 6285 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
6286 std::string upload_data_string(initial_window_size, 'a'); | 6286 std::string upload_data_string(initial_window_size, 'a'); |
6287 upload_data_string.append(kUploadData, kUploadDataSize); | 6287 upload_data_string.append(kUploadData, kUploadDataSize); |
6288 element_readers.push_back(new UploadBytesElementReader( | 6288 element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
6289 upload_data_string.c_str(), upload_data_string.size())); | 6289 upload_data_string.c_str(), upload_data_string.size()))); |
6290 ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); | 6290 ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
6291 | 6291 |
6292 HttpRequestInfo request; | 6292 HttpRequestInfo request; |
6293 request.method = "POST"; | 6293 request.method = "POST"; |
6294 request.url = GURL(GetDefaultUrl()); | 6294 request.url = GURL(GetDefaultUrl()); |
6295 request.upload_data_stream = &upload_data_stream; | 6295 request.upload_data_stream = &upload_data_stream; |
6296 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, | 6296 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, |
6297 BoundNetLog(), GetParam(), NULL); | 6297 BoundNetLog(), GetParam(), NULL); |
6298 helper.SetDeterministic(); | 6298 helper.SetDeterministic(); |
6299 helper.RunPreTestSetup(); | 6299 helper.RunPreTestSetup(); |
6300 helper.AddDeterministicData(&data); | 6300 helper.AddDeterministicData(&data); |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6396 reads.push_back(CreateMockRead(*reply, i++)); | 6396 reads.push_back(CreateMockRead(*reply, i++)); |
6397 reads.push_back(CreateMockRead(*body2, i++)); | 6397 reads.push_back(CreateMockRead(*body2, i++)); |
6398 reads.push_back(CreateMockRead(*body3, i++)); | 6398 reads.push_back(CreateMockRead(*body3, i++)); |
6399 reads.push_back(MockRead(ASYNC, 0, i++)); // EOF | 6399 reads.push_back(MockRead(ASYNC, 0, i++)); // EOF |
6400 | 6400 |
6401 // Force all writes to happen before any read, last write will not | 6401 // Force all writes to happen before any read, last write will not |
6402 // actually queue a frame, due to window size being 0. | 6402 // actually queue a frame, due to window size being 0. |
6403 DeterministicSocketData data(vector_as_array(&reads), reads.size(), | 6403 DeterministicSocketData data(vector_as_array(&reads), reads.size(), |
6404 vector_as_array(&writes), writes.size()); | 6404 vector_as_array(&writes), writes.size()); |
6405 | 6405 |
6406 ScopedVector<UploadElementReader> element_readers; | 6406 std::vector<scoped_ptr<UploadElementReader>> element_readers; |
6407 std::string upload_data_string(initial_window_size, 'a'); | 6407 std::string upload_data_string(initial_window_size, 'a'); |
6408 upload_data_string.append(kUploadData, kUploadDataSize); | 6408 upload_data_string.append(kUploadData, kUploadDataSize); |
6409 element_readers.push_back(new UploadBytesElementReader( | 6409 element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
6410 upload_data_string.c_str(), upload_data_string.size())); | 6410 upload_data_string.c_str(), upload_data_string.size()))); |
6411 ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); | 6411 ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
6412 | 6412 |
6413 HttpRequestInfo request; | 6413 HttpRequestInfo request; |
6414 request.method = "POST"; | 6414 request.method = "POST"; |
6415 request.url = GURL(GetDefaultUrl()); | 6415 request.url = GURL(GetDefaultUrl()); |
6416 request.upload_data_stream = &upload_data_stream; | 6416 request.upload_data_stream = &upload_data_stream; |
6417 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, | 6417 NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, |
6418 BoundNetLog(), GetParam(), NULL); | 6418 BoundNetLog(), GetParam(), NULL); |
6419 helper.SetDeterministic(); | 6419 helper.SetDeterministic(); |
6420 helper.RunPreTestSetup(); | 6420 helper.RunPreTestSetup(); |
6421 helper.AddDeterministicData(&data); | 6421 helper.AddDeterministicData(&data); |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6653 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { | 6653 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { |
6654 scoped_ptr<SSLSocketDataProvider> ssl_provider( | 6654 scoped_ptr<SSLSocketDataProvider> ssl_provider( |
6655 new SSLSocketDataProvider(ASYNC, OK)); | 6655 new SSLSocketDataProvider(ASYNC, OK)); |
6656 // Set to TLS_RSA_WITH_NULL_MD5 | 6656 // Set to TLS_RSA_WITH_NULL_MD5 |
6657 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); | 6657 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); |
6658 | 6658 |
6659 RunTLSUsageCheckTest(ssl_provider.Pass()); | 6659 RunTLSUsageCheckTest(ssl_provider.Pass()); |
6660 } | 6660 } |
6661 | 6661 |
6662 } // namespace net | 6662 } // namespace net |
OLD | NEW |