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 "content/browser/loader/upload_data_stream_builder.h" | 5 #include "content/browser/loader/upload_data_stream_builder.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/message_loop/message_loop_proxy.h" | 12 #include "base/message_loop/message_loop_proxy.h" |
13 #include "base/run_loop.h" | |
13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
14 #include "content/common/resource_request_body.h" | 15 #include "content/common/resource_request_body.h" |
15 #include "net/base/upload_bytes_element_reader.h" | 16 #include "net/base/upload_bytes_element_reader.h" |
16 #include "net/base/upload_data_stream.h" | 17 #include "net/base/upload_data_stream.h" |
17 #include "net/base/upload_file_element_reader.h" | 18 #include "net/base/upload_file_element_reader.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
19 #include "url/gurl.h" | 20 #include "url/gurl.h" |
20 #include "webkit/browser/blob/blob_storage_context.h" | 21 #include "webkit/browser/blob/blob_storage_context.h" |
21 | 22 |
22 using webkit_blob::BlobData; | 23 using webkit_blob::BlobData; |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
250 base::MessageLoopProxy::current().get()); | 251 base::MessageLoopProxy::current().get()); |
251 ASSERT_EQ(8U, upload->element_readers().size()); | 252 ASSERT_EQ(8U, upload->element_readers().size()); |
252 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1)); | 253 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1)); |
253 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2)); | 254 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2)); |
254 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1)); | 255 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1)); |
255 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element1)); | 256 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element1)); |
256 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[4], blob_element2)); | 257 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[4], blob_element2)); |
257 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[5], blob_element1)); | 258 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[5], blob_element1)); |
258 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[6], blob_element2)); | 259 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[6], blob_element2)); |
259 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[7], upload_element2)); | 260 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[7], upload_element2)); |
261 | |
262 // Clean up for ASAN. | |
263 handle1.reset(); | |
264 handle2.reset(); | |
michaeln
2014/05/01 18:50:48
bah... also need to reset request_body and maybe u
| |
265 base::RunLoop run_loop; | |
266 run_loop.RunUntilIdle(); | |
michaeln
2014/05/01 18:50:48
i've seen this more consisely written as...
base::
| |
260 } | 267 } |
261 | 268 |
262 } // namespace content | 269 } // namespace content |
OLD | NEW |