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

Side by Side Diff: net/url_request/url_request_ftp_job_unittest.cc

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « net/url_request/url_request_file_job.cc ('k') | net/url_request/url_request_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/url_request/url_request_ftp_job.h" 5 #include "net/url_request/url_request_ftp_job.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 class URLRequestFtpJobTest : public testing::Test { 210 class URLRequestFtpJobTest : public testing::Test {
211 public: 211 public:
212 URLRequestFtpJobTest() 212 URLRequestFtpJobTest()
213 : request_context_(&socket_factory_, 213 : request_context_(&socket_factory_,
214 new ProxyService( 214 new ProxyService(
215 new SimpleProxyConfigService, NULL, NULL), 215 new SimpleProxyConfigService, NULL, NULL),
216 &network_delegate_, 216 &network_delegate_,
217 &ftp_transaction_factory_) { 217 &ftp_transaction_factory_) {
218 } 218 }
219 219
220 virtual ~URLRequestFtpJobTest() { 220 ~URLRequestFtpJobTest() override {
221 // Clean up any remaining tasks that mess up unrelated tests. 221 // Clean up any remaining tasks that mess up unrelated tests.
222 base::RunLoop run_loop; 222 base::RunLoop run_loop;
223 run_loop.RunUntilIdle(); 223 run_loop.RunUntilIdle();
224 } 224 }
225 225
226 void AddSocket(MockRead* reads, size_t reads_size, 226 void AddSocket(MockRead* reads, size_t reads_size,
227 MockWrite* writes, size_t writes_size) { 227 MockWrite* writes, size_t writes_size) {
228 DeterministicSocketData* socket_data = new DeterministicSocketData( 228 DeterministicSocketData* socket_data = new DeterministicSocketData(
229 reads, reads_size, writes, writes_size); 229 reads, reads_size, writes, writes_size);
230 socket_data->set_connect_data(MockConnect(SYNCHRONOUS, OK)); 230 socket_data->set_connect_data(MockConnect(SYNCHRONOUS, OK));
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 EXPECT_TRUE(url_request2->status().is_success()); 697 EXPECT_TRUE(url_request2->status().is_success());
698 EXPECT_EQ(2, network_delegate()->completed_requests()); 698 EXPECT_EQ(2, network_delegate()->completed_requests());
699 EXPECT_EQ(0, network_delegate()->error_count()); 699 EXPECT_EQ(0, network_delegate()->error_count());
700 EXPECT_FALSE(request_delegate2.auth_required_called()); 700 EXPECT_FALSE(request_delegate2.auth_required_called());
701 EXPECT_EQ("test2.html", request_delegate2.data_received()); 701 EXPECT_EQ("test2.html", request_delegate2.data_received());
702 } 702 }
703 703
704 } // namespace 704 } // namespace
705 705
706 } // namespace net 706 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_file_job.cc ('k') | net/url_request/url_request_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698