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

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

Issue 12261025: Revert "Add SetUploadDataStream method to URLFetcher." which broke URLFetcher retries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/url_request/test_url_fetcher_factory.h ('k') | net/url_request/url_fetcher.h » ('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/test_url_fetcher_factory.h" 5 #include "net/url_request/test_url_fetcher_factory.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "net/base/host_port_pair.h" 13 #include "net/base/host_port_pair.h"
14 #include "net/base/upload_data_stream.h"
15 #include "net/http/http_response_headers.h" 14 #include "net/http/http_response_headers.h"
16 #include "net/url_request/url_fetcher_delegate.h" 15 #include "net/url_request/url_fetcher_delegate.h"
17 #include "net/url_request/url_fetcher_impl.h" 16 #include "net/url_request/url_fetcher_impl.h"
18 #include "net/url_request/url_request_status.h" 17 #include "net/url_request/url_request_status.h"
19 18
20 namespace net { 19 namespace net {
21 20
22 ScopedURLFetcherFactory::ScopedURLFetcherFactory( 21 ScopedURLFetcherFactory::ScopedURLFetcherFactory(
23 URLFetcherFactory* factory) { 22 URLFetcherFactory* factory) {
24 DCHECK(!URLFetcherImpl::factory()); 23 DCHECK(!URLFetcherImpl::factory());
(...skipping 21 matching lines...) Expand all
46 fake_max_retries_(0) { 45 fake_max_retries_(0) {
47 } 46 }
48 47
49 TestURLFetcher::~TestURLFetcher() { 48 TestURLFetcher::~TestURLFetcher() {
50 if (delegate_for_tests_) 49 if (delegate_for_tests_)
51 delegate_for_tests_->OnRequestEnd(id_); 50 delegate_for_tests_->OnRequestEnd(id_);
52 if (owner_) 51 if (owner_)
53 owner_->RemoveFetcherFromMap(id_); 52 owner_->RemoveFetcherFromMap(id_);
54 } 53 }
55 54
56 void TestURLFetcher::SetUploadDataStream(
57 const std::string& upload_content_type,
58 scoped_ptr<UploadDataStream> upload_content) {
59 upload_data_stream_ = upload_content.Pass();
60 }
61
62 void TestURLFetcher::SetUploadData(const std::string& upload_content_type, 55 void TestURLFetcher::SetUploadData(const std::string& upload_content_type,
63 const std::string& upload_content) { 56 const std::string& upload_content) {
64 upload_data_ = upload_content; 57 upload_data_ = upload_content;
65 } 58 }
66 59
67 void TestURLFetcher::SetChunkedUpload(const std::string& upload_content_type) { 60 void TestURLFetcher::SetChunkedUpload(const std::string& upload_content_type) {
68 } 61 }
69 62
70 void TestURLFetcher::AppendChunkToUpload(const std::string& data, 63 void TestURLFetcher::AppendChunkToUpload(const std::string& data,
71 bool is_last_chunk) { 64 bool is_last_chunk) {
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 363
371 URLFetcher* URLFetcherImplFactory::CreateURLFetcher( 364 URLFetcher* URLFetcherImplFactory::CreateURLFetcher(
372 int id, 365 int id,
373 const GURL& url, 366 const GURL& url,
374 URLFetcher::RequestType request_type, 367 URLFetcher::RequestType request_type,
375 URLFetcherDelegate* d) { 368 URLFetcherDelegate* d) {
376 return new URLFetcherImpl(url, request_type, d); 369 return new URLFetcherImpl(url, request_type, d);
377 } 370 }
378 371
379 } // namespace net 372 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/test_url_fetcher_factory.h ('k') | net/url_request/url_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698