net: Change type of UploadData::elements from std::vector to ScopedVector

webkit/glue/resource_request_body_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 "webkit/glue/resource_request_body.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
@@ skipping 18 matching lines @@
 
   request_body->AppendBytes(kData, arraysize(kData) - 1);
   request_body->AppendFileRange(FilePath(kFilePath),
                                 kFileOffset, kFileLength, kFileTime);
   request_body->set_identifier(kIdentifier);
 
   scoped_refptr<net::UploadData> upload =
       request_body->ResolveElementsAndCreateUploadData(NULL);
 
   EXPECT_EQ(kIdentifier, upload->identifier());
-  ASSERT_EQ(request_body->elements()->size(), upload->elements()->size());
+  ASSERT_EQ(request_body->elements()->size(), upload->elements().size());
 
-  const net::UploadElement& e1 = upload->elements()->at(0);
+  const net::UploadElement& e1 = *upload->elements()[0];
   EXPECT_EQ(net::UploadElement::TYPE_BYTES, e1.type());
   EXPECT_EQ(kData, std::string(e1.bytes(), e1.bytes_length()));
 
-  const net::UploadElement& e2 = upload->elements()->at(1);
+  const net::UploadElement& e2 = *upload->elements()[1];
   EXPECT_EQ(net::UploadElement::TYPE_FILE, e2.type());
   EXPECT_EQ(kFilePath, e2.file_path().value());
   EXPECT_EQ(kFileOffset, e2.file_range_offset());
   EXPECT_EQ(kFileLength, e2.file_range_length());
   EXPECT_EQ(kFileTime, e2.expected_file_modification_time());
 }
 
 TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadData) {
   // Setup blob data for testing.
   base::Time time1, time2;
@@ skipping 44 matching lines @@
   request_body->AppendFileRange(
       upload_element2.file_path(),
       upload_element2.file_range_offset(),
       upload_element2.file_range_length(),
       upload_element2.expected_file_modification_time());
 
   scoped_refptr<net::UploadData> upload =
       request_body->ResolveElementsAndCreateUploadData(
           &blob_storage_controller);
 
-  ASSERT_EQ(upload->elements()->size(), 2U);
-  EXPECT_TRUE(upload->elements()->at(0) == upload_element1);
-  EXPECT_TRUE(upload->elements()->at(1) == upload_element2);
+  ASSERT_EQ(upload->elements().size(), 2U);
+  EXPECT_TRUE(*upload->elements()[0] == upload_element1);
+  EXPECT_TRUE(*upload->elements()[1] == upload_element2);
 
   // Test having only one blob reference that refers to empty blob data.
   request_body = new ResourceRequestBody();
   request_body->AppendBlob(blob_url0);
 
   upload = request_body->ResolveElementsAndCreateUploadData(
       &blob_storage_controller);
-  ASSERT_EQ(upload->elements()->size(), 0U);
+  ASSERT_EQ(upload->elements().size(), 0U);
 
   // Test having only one blob reference.
   request_body = new ResourceRequestBody();
   request_body->AppendBlob(blob_url1);
 
   upload = request_body->ResolveElementsAndCreateUploadData(
       &blob_storage_controller);
-  ASSERT_EQ(upload->elements()->size(), 2U);
-  EXPECT_TRUE(upload->elements()->at(0) == blob_element1);
-  EXPECT_TRUE(upload->elements()->at(1) == blob_element2);
+  ASSERT_EQ(upload->elements().size(), 2U);
+  EXPECT_TRUE(*upload->elements()[0] == blob_element1);
+  EXPECT_TRUE(*upload->elements()[1] == blob_element2);
 
   // Test having one blob reference at the beginning.
   request_body = new ResourceRequestBody();
   request_body->AppendBlob(blob_url1);
   request_body->AppendBytes(
       upload_element1.bytes(),
       upload_element1.bytes_length());
   request_body->AppendFileRange(
       upload_element2.file_path(),
       upload_element2.file_range_offset(),
       upload_element2.file_range_length(),
       upload_element2.expected_file_modification_time());
 
   upload = request_body->ResolveElementsAndCreateUploadData(
       &blob_storage_controller);
-  ASSERT_EQ(upload->elements()->size(), 4U);
-  EXPECT_TRUE(upload->elements()->at(0) == blob_element1);
-  EXPECT_TRUE(upload->elements()->at(1) == blob_element2);
-  EXPECT_TRUE(upload->elements()->at(2) == upload_element1);
-  EXPECT_TRUE(upload->elements()->at(3) == upload_element2);
+  ASSERT_EQ(upload->elements().size(), 4U);
+  EXPECT_TRUE(*upload->elements()[0] == blob_element1);
+  EXPECT_TRUE(*upload->elements()[1] == blob_element2);
+  EXPECT_TRUE(*upload->elements()[2] == upload_element1);
+  EXPECT_TRUE(*upload->elements()[3] == upload_element2);
 
   // Test having one blob reference at the end.
   request_body = new ResourceRequestBody();
   request_body->AppendBytes(
       upload_element1.bytes(),
       upload_element1.bytes_length());
   request_body->AppendFileRange(
       upload_element2.file_path(),
       upload_element2.file_range_offset(),
       upload_element2.file_range_length(),
       upload_element2.expected_file_modification_time());
   request_body->AppendBlob(blob_url1);
 
   upload = request_body->ResolveElementsAndCreateUploadData(
       &blob_storage_controller);
-  ASSERT_EQ(upload->elements()->size(), 4U);
-  EXPECT_TRUE(upload->elements()->at(0) == upload_element1);
-  EXPECT_TRUE(upload->elements()->at(1) == upload_element2);
-  EXPECT_TRUE(upload->elements()->at(2) == blob_element1);
-  EXPECT_TRUE(upload->elements()->at(3) == blob_element2);
+  ASSERT_EQ(upload->elements().size(), 4U);
+  EXPECT_TRUE(*upload->elements()[0] == upload_element1);
+  EXPECT_TRUE(*upload->elements()[1] == upload_element2);
+  EXPECT_TRUE(*upload->elements()[2] == blob_element1);
+  EXPECT_TRUE(*upload->elements()[3] == blob_element2);
 
   // Test having one blob reference in the middle.
   request_body = new ResourceRequestBody();
   request_body->AppendBytes(
       upload_element1.bytes(),
       upload_element1.bytes_length());
   request_body->AppendBlob(blob_url1);
   request_body->AppendFileRange(
       upload_element2.file_path(),
       upload_element2.file_range_offset(),
       upload_element2.file_range_length(),
       upload_element2.expected_file_modification_time());
 
   upload = request_body->ResolveElementsAndCreateUploadData(
       &blob_storage_controller);
-  ASSERT_EQ(upload->elements()->size(), 4U);
-  EXPECT_TRUE(upload->elements()->at(0) == upload_element1);
-  EXPECT_TRUE(upload->elements()->at(1) == blob_element1);
-  EXPECT_TRUE(upload->elements()->at(2) == blob_element2);
-  EXPECT_TRUE(upload->elements()->at(3) == upload_element2);
+  ASSERT_EQ(upload->elements().size(), 4U);
+  EXPECT_TRUE(*upload->elements()[0] == upload_element1);
+  EXPECT_TRUE(*upload->elements()[1] == blob_element1);
+  EXPECT_TRUE(*upload->elements()[2] == blob_element2);
+  EXPECT_TRUE(*upload->elements()[3] == upload_element2);
 
   // Test having multiple blob references.
   request_body = new ResourceRequestBody();
   request_body->AppendBlob(blob_url1);
   request_body->AppendBytes(
       upload_element1.bytes(),
       upload_element1.bytes_length());
   request_body->AppendBlob(blob_url2);
   request_body->AppendBlob(blob_url3);
   request_body->AppendFileRange(
       upload_element2.file_path(),
       upload_element2.file_range_offset(),
       upload_element2.file_range_length(),
       upload_element2.expected_file_modification_time());
 
   upload = request_body->ResolveElementsAndCreateUploadData(
       &blob_storage_controller);
-  ASSERT_EQ(upload->elements()->size(), 8U);
-  EXPECT_TRUE(upload->elements()->at(0) == blob_element1);
-  EXPECT_TRUE(upload->elements()->at(1) == blob_element2);
-  EXPECT_TRUE(upload->elements()->at(2) == upload_element1);
-  EXPECT_TRUE(upload->elements()->at(3) == blob_element1);
-  EXPECT_TRUE(upload->elements()->at(4) == blob_element2);
-  EXPECT_TRUE(upload->elements()->at(5) == blob_element1);
-  EXPECT_TRUE(upload->elements()->at(6) == blob_element2);
-  EXPECT_TRUE(upload->elements()->at(7) == upload_element2);
+  ASSERT_EQ(upload->elements().size(), 8U);

[mmenke, 2012/11/09 15:50:19]

While you're here, mind flipping the order of the parameters in the 7 asserts
like this one?

[hashimoto, 2012/11/10 09:34:52]

Done.

+  EXPECT_TRUE(*upload->elements()[0] == blob_element1);
+  EXPECT_TRUE(*upload->elements()[1] == blob_element2);
+  EXPECT_TRUE(*upload->elements()[2] == upload_element1);
+  EXPECT_TRUE(*upload->elements()[3] == blob_element1);
+  EXPECT_TRUE(*upload->elements()[4] == blob_element2);
+  EXPECT_TRUE(*upload->elements()[5] == blob_element1);
+  EXPECT_TRUE(*upload->elements()[6] == blob_element2);
+  EXPECT_TRUE(*upload->elements()[7] == upload_element2);
 }
 
 }  // namespace webkit_glue