Factor out common Element struct from BlobData and ResourceRequestBody

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 60 matching lines @@
 
   GURL blob_url2("blob://url_2");
   blob_storage_controller.CloneBlob(blob_url2, blob_url1);
 
   GURL blob_url3("blob://url_3");
   blob_storage_controller.CloneBlob(blob_url3, blob_url2);
 
   // Setup upload data elements for comparison.
   net::UploadElement blob_element1, blob_element2;
   blob_element1.SetToBytes(
-      blob_data->items().at(0).data.c_str() +
-          static_cast<int>(blob_data->items().at(0).offset),
-      static_cast<int>(blob_data->items().at(0).length));
+      blob_data->items().at(0).bytes() +
+          static_cast<int>(blob_data->items().at(0).offset()),
+      static_cast<int>(blob_data->items().at(0).length()));
   blob_element2.SetToFilePathRange(
-      blob_data->items().at(1).file_path,
-      blob_data->items().at(1).offset,
-      blob_data->items().at(1).length,
-      blob_data->items().at(1).expected_modification_time);
+      blob_data->items().at(1).path(),
+      blob_data->items().at(1).offset(),
+      blob_data->items().at(1).length(),
+      blob_data->items().at(1).expected_modification_time());
 
   net::UploadElement upload_element1, upload_element2;
   upload_element1.SetToBytes("Hello", 5);
   upload_element2.SetToFilePathRange(
       FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2);
 
   // Test no blob reference.
   scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
   request_body->AppendBytes(
       upload_element1.bytes(),
@@ skipping 111 matching lines @@
   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);
 }
 
 }  // namespace webkit_glue