Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/elements_upload_data_stream_unittest.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h ('K') | « net/base/elements_upload_data_stream.cc ('k') | net/base/upload_data_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/elements_upload_data_stream_unittest.cc
diff --git a/net/base/elements_upload_data_stream_unittest.cc b/net/base/elements_upload_data_stream_unittest.cc
index 9d4f42a433935c63e84715a70af1703aa8b2503f..3ed3f3975fce3073c202d6d9a1979c14877f055b 100644
--- a/net/base/elements_upload_data_stream_unittest.cc
+++ b/net/base/elements_upload_data_stream_unittest.cc
@@ -154,7 +154,7 @@ class ElementsUploadDataStreamTest : public PlatformTest {
TEST_F(ElementsUploadDataStreamTest, EmptyUploadData) {
std::unique_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(std::move(element_readers_), 0));
- ASSERT_THAT(stream->Init(CompletionCallback(), BoundNetLog()), IsOk());
+ ASSERT_THAT(stream->Init(CompletionCallback(), NetLogWithSource()), IsOk());
EXPECT_TRUE(stream->IsInMemory());
EXPECT_EQ(0U, stream->size());
EXPECT_EQ(0U, stream->position());
@@ -166,7 +166,7 @@ TEST_F(ElementsUploadDataStreamTest, ConsumeAllBytes) {
base::MakeUnique<UploadBytesElementReader>(kTestData, kTestDataSize));
std::unique_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(std::move(element_readers_), 0));
- ASSERT_THAT(stream->Init(CompletionCallback(), BoundNetLog()), IsOk());
+ ASSERT_THAT(stream->Init(CompletionCallback(), NetLogWithSource()), IsOk());
EXPECT_TRUE(stream->IsInMemory());
EXPECT_EQ(kTestDataSize, stream->size());
EXPECT_EQ(0U, stream->position());
@@ -195,7 +195,7 @@ TEST_F(ElementsUploadDataStreamTest, File) {
TestCompletionCallback init_callback;
std::unique_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(std::move(element_readers_), 0));
- ASSERT_THAT(stream->Init(init_callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
ASSERT_THAT(init_callback.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsInMemory());
@@ -232,7 +232,7 @@ TEST_F(ElementsUploadDataStreamTest, FileSmallerThanLength) {
TestCompletionCallback init_callback;
std::unique_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(std::move(element_readers_), 0));
- ASSERT_THAT(stream->Init(init_callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
ASSERT_THAT(init_callback.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsInMemory());
@@ -274,7 +274,7 @@ TEST_F(ElementsUploadDataStreamTest, ReadErrorSync) {
new ElementsUploadDataStream(std::move(element_readers_), 0));
// Run Init().
- ASSERT_THAT(stream->Init(CompletionCallback(), BoundNetLog()), IsOk());
+ ASSERT_THAT(stream->Init(CompletionCallback(), NetLogWithSource()), IsOk());
EXPECT_EQ(kTestDataSize*2, stream->size());
EXPECT_EQ(0U, stream->position());
EXPECT_FALSE(stream->IsEOF());
@@ -310,7 +310,7 @@ TEST_F(ElementsUploadDataStreamTest, ReadErrorAsync) {
// Run Init().
TestCompletionCallback init_callback;
- ASSERT_THAT(stream->Init(init_callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(init_callback.WaitForResult(), IsOk());
EXPECT_EQ(kTestDataSize*2, stream->size());
@@ -353,7 +353,7 @@ TEST_F(ElementsUploadDataStreamTest, FileAndBytes) {
TestCompletionCallback init_callback;
std::unique_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(std::move(element_readers_), 0));
- ASSERT_THAT(stream->Init(init_callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
ASSERT_THAT(init_callback.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsInMemory());
@@ -406,7 +406,7 @@ TEST_F(ElementsUploadDataStreamTest, InitAsync) {
// Run Init().
TestCompletionCallback callback;
- ASSERT_THAT(stream->Init(callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(callback.WaitForResult(), IsOk());
}
@@ -424,7 +424,7 @@ TEST_F(ElementsUploadDataStreamTest, InitAsyncFailureAsync) {
// Run Init().
TestCompletionCallback callback;
- ASSERT_THAT(stream->Init(callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(callback.WaitForResult(), IsError(ERR_FAILED));
}
@@ -447,7 +447,7 @@ TEST_F(ElementsUploadDataStreamTest, InitAsyncFailureSync) {
// Run Init().
TestCompletionCallback callback;
- ASSERT_THAT(stream->Init(callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(callback.WaitForResult(), IsError(ERR_FAILED));
}
@@ -459,7 +459,7 @@ TEST_F(ElementsUploadDataStreamTest, ReadAsyncWithExactSizeBuffer) {
std::unique_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(std::move(element_readers_), 0));
- ASSERT_THAT(stream->Init(CompletionCallback(), BoundNetLog()), IsOk());
+ ASSERT_THAT(stream->Init(CompletionCallback(), NetLogWithSource()), IsOk());
EXPECT_TRUE(stream->IsInMemory());
EXPECT_EQ(kTestDataSize, stream->size());
EXPECT_EQ(0U, stream->position());
@@ -503,7 +503,7 @@ TEST_F(ElementsUploadDataStreamTest, ReadAsync) {
// Run Init().
TestCompletionCallback init_callback;
- EXPECT_THAT(stream->Init(init_callback.callback(), BoundNetLog()),
+ EXPECT_THAT(stream->Init(init_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(init_callback.WaitForResult(), IsOk());
@@ -544,7 +544,7 @@ void ElementsUploadDataStreamTest::FileChangedHelper(
TestCompletionCallback init_callback;
std::unique_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(std::move(element_readers), 0));
- ASSERT_THAT(stream->Init(init_callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
int error_code = init_callback.WaitForResult();
if (error_expected)
@@ -593,7 +593,7 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInit) {
// Call Init().
TestCompletionCallback init_callback1;
- ASSERT_THAT(stream->Init(init_callback1.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback1.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
ASSERT_THAT(init_callback1.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -605,7 +605,7 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInit) {
// Call Init() again to reset.
TestCompletionCallback init_callback2;
- ASSERT_THAT(stream->Init(init_callback2.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback2.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
ASSERT_THAT(init_callback2.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -637,7 +637,7 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInitAsync) {
expected_data += expected_data;
// Call Init().
- ASSERT_THAT(stream->Init(test_callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(test_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(test_callback.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -648,7 +648,7 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInitAsync) {
EXPECT_TRUE(stream->IsEOF());
// Call Init() again to reset.
- ASSERT_THAT(stream->Init(test_callback.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(test_callback.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(test_callback.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -681,7 +681,7 @@ TEST_F(ElementsUploadDataStreamTest, InitToReset) {
// Call Init().
TestCompletionCallback init_callback1;
- ASSERT_THAT(stream->Init(init_callback1.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback1.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(init_callback1.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -700,7 +700,7 @@ TEST_F(ElementsUploadDataStreamTest, InitToReset) {
// Call Init to reset the state.
TestCompletionCallback init_callback2;
- ASSERT_THAT(stream->Init(init_callback2.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback2.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(init_callback2.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -739,12 +739,12 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncInit) {
// Start Init.
TestCompletionCallback init_callback1;
- EXPECT_THAT(stream->Init(init_callback1.callback(), BoundNetLog()),
+ EXPECT_THAT(stream->Init(init_callback1.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
// Call Init again to cancel the previous init.
TestCompletionCallback init_callback2;
- EXPECT_THAT(stream->Init(init_callback2.callback(), BoundNetLog()),
+ EXPECT_THAT(stream->Init(init_callback2.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(init_callback2.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -787,7 +787,7 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncRead) {
// Call Init().
TestCompletionCallback init_callback1;
- ASSERT_THAT(stream->Init(init_callback1.callback(), BoundNetLog()),
+ ASSERT_THAT(stream->Init(init_callback1.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(init_callback1.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
@@ -804,7 +804,7 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncRead) {
// Call Init to cancel the previous read.
TestCompletionCallback init_callback2;
- EXPECT_THAT(stream->Init(init_callback2.callback(), BoundNetLog()),
+ EXPECT_THAT(stream->Init(init_callback2.callback(), NetLogWithSource()),
IsError(ERR_IO_PENDING));
EXPECT_THAT(init_callback2.WaitForResult(), IsOk());
EXPECT_FALSE(stream->IsEOF());
« components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h ('K') | « net/base/elements_upload_data_stream.cc ('k') | net/base/upload_data_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698