Move some classes out of webkit/glue/.

content/browser/loader/upload_data_stream_builder_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 "content/browser/loader/upload_data_stream_builder.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/blob/blob_storage_controller.h"
+#include "webkit/common/resource_request_body.h"
 
 using webkit_blob::BlobData;
 using webkit_blob::BlobStorageController;
+using webkit_glue::ResourceRequestBody;
 
-namespace webkit_glue {
-
+namespace content {
 namespace {
 
 bool AreElementsEqual(const net::UploadElementReader& reader,
                       const ResourceRequestBody::Element& element) {
   switch(element.type()) {
     case ResourceRequestBody::Element::TYPE_BYTES: {
       const net::UploadBytesElementReader* bytes_reader =
           reader.AsBytesReader();
       return bytes_reader &&
           element.length() == bytes_reader->length() &&
@@ skipping 11 matching lines @@
       break;
     }
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace
 
-TEST(ResourceRequestBodyTest, CreateUploadDataStreamWithoutBlob) {
+TEST(UploadDataStreamBuilderTest, CreateUploadDataStreamWithoutBlob) {
   base::MessageLoop message_loop;
   scoped_refptr<ResourceRequestBody> request_body = new ResourceRequestBody;
 
   const char kData[] = "123";
   const base::FilePath::StringType kFilePath = FILE_PATH_LITERAL("abc");
   const uint64 kFileOffset = 10U;
   const uint64 kFileLength = 100U;
   const base::Time kFileTime = base::Time::FromDoubleT(999);
   const int64 kIdentifier = 12345;
 
   request_body->AppendBytes(kData, arraysize(kData) - 1);
   request_body->AppendFileRange(base::FilePath(kFilePath),
                                 kFileOffset, kFileLength, kFileTime);
   request_body->set_identifier(kIdentifier);
 
   scoped_ptr<net::UploadDataStream> upload(
-      request_body->ResolveElementsAndCreateUploadDataStream(
-          NULL, NULL, base::MessageLoopProxy::current().get()));
+      UploadDataStreamBuilder::Build(
+          request_body, NULL, NULL, base::MessageLoopProxy::current().get()));
 
   EXPECT_EQ(kIdentifier, upload->identifier());
   ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size());
 
   const net::UploadBytesElementReader* r1 =
       upload->element_readers()[0]->AsBytesReader();
   ASSERT_TRUE(r1);
   EXPECT_EQ(kData, std::string(r1->bytes(), r1->length()));
 
   const net::UploadFileElementReader* r2 =
       upload->element_readers()[1]->AsFileReader();
   ASSERT_TRUE(r2);
   EXPECT_EQ(kFilePath, r2->path().value());
   EXPECT_EQ(kFileOffset, r2->range_offset());
   EXPECT_EQ(kFileLength, r2->range_length());
   EXPECT_EQ(kFileTime, r2->expected_modification_time());
 }
 
-TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
+TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
   base::MessageLoop message_loop;
   // Setup blob data for testing.
   base::Time time1, time2;
   base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1);
   base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2);
 
   BlobStorageController blob_storage_controller;
   scoped_refptr<BlobData> blob_data(new BlobData());
 
   GURL blob_url0("blob://url_0");
@@ skipping 31 matching lines @@
 
   // Test no blob reference.
   scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
   request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
   request_body->AppendFileRange(upload_element2.path(),
                                 upload_element2.offset(),
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
 
   scoped_ptr<net::UploadDataStream> upload(
-      request_body->ResolveElementsAndCreateUploadDataStream(
+      UploadDataStreamBuilder::Build(
+          request_body,
           &blob_storage_controller,
           NULL,
           base::MessageLoopProxy::current().get()));
 
   ASSERT_EQ(2U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[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.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller, NULL, base::MessageLoopProxy::current().get()));
+  upload = UploadDataStreamBuilder::Build(
+      request_body,
+      &blob_storage_controller,
+      NULL,
+      base::MessageLoopProxy::current().get());
   ASSERT_EQ(0U, upload->element_readers().size());
 
   // Test having only one blob reference.
   request_body = new ResourceRequestBody();
   request_body->AppendBlob(blob_url1);
 
-  upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller, NULL, base::MessageLoopProxy::current().get()));
+  upload = UploadDataStreamBuilder::Build(
+      request_body,
+      &blob_storage_controller,
+      NULL,
+      base::MessageLoopProxy::current().get());
   ASSERT_EQ(2U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[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.length());
   request_body->AppendFileRange(upload_element2.path(),
                                 upload_element2.offset(),
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
 
-  upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller, NULL, base::MessageLoopProxy::current().get()));
+  upload = UploadDataStreamBuilder::Build(
+      request_body,
+      &blob_storage_controller,
+      NULL,
+      base::MessageLoopProxy::current().get());
   ASSERT_EQ(4U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], upload_element2));
 
   // Test having one blob reference at the end.
   request_body = new ResourceRequestBody();
   request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
   request_body->AppendFileRange(upload_element2.path(),
                                 upload_element2.offset(),
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
   request_body->AppendBlob(blob_url1);
 
-  upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller, NULL, base::MessageLoopProxy::current().get()));
+  upload = UploadDataStreamBuilder::Build(
+      request_body,
+      &blob_storage_controller,
+      NULL,
+      base::MessageLoopProxy::current().get());
   ASSERT_EQ(4U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], upload_element2));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element2));
 
   // Test having one blob reference in the middle.
   request_body = new ResourceRequestBody();
   request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
   request_body->AppendBlob(blob_url1);
   request_body->AppendFileRange(upload_element2.path(),
                                 upload_element2.offset(),
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
 
-  upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller, NULL, base::MessageLoopProxy::current().get()));
+  upload = UploadDataStreamBuilder::Build(
+      request_body,
+      &blob_storage_controller,
+      NULL,
+      base::MessageLoopProxy::current().get());
   ASSERT_EQ(4U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], blob_element2));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[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.length());
   request_body->AppendBlob(blob_url2);
   request_body->AppendBlob(blob_url3);
   request_body->AppendFileRange(upload_element2.path(),
                                 upload_element2.offset(),
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
 
-  upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller, NULL, base::MessageLoopProxy::current().get()));
+  upload = UploadDataStreamBuilder::Build(
+      request_body,
+      &blob_storage_controller,
+      NULL,
+      base::MessageLoopProxy::current().get());
   ASSERT_EQ(8U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[4], blob_element2));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[5], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[6], blob_element2));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[7], upload_element2));
 }
 
-}  // namespace webkit_glue
+}  // namespace content