diff options
Diffstat (limited to 'net/url_request')
25 files changed, 89 insertions, 89 deletions
diff --git a/net/url_request/url_request_about_job.cc b/net/url_request/url_request_about_job.cc index 145093e..51cd9bf 100644 --- a/net/url_request/url_request_about_job.cc +++ b/net/url_request/url_request_about_job.cc @@ -11,13 +11,13 @@ #include "base/message_loop.h" // static -URLRequestJob* URLRequestAboutJob::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* URLRequestAboutJob::Factory(net::URLRequest* request, + const std::string& scheme) { return new URLRequestAboutJob(request); } URLRequestAboutJob::URLRequestAboutJob(net::URLRequest* request) - : URLRequestJob(request) { + : net::URLRequestJob(request) { } void URLRequestAboutJob::Start() { diff --git a/net/url_request/url_request_about_job.h b/net/url_request/url_request_about_job.h index 65f1f61..cd1d372 100644 --- a/net/url_request/url_request_about_job.h +++ b/net/url_request/url_request_about_job.h @@ -11,7 +11,7 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" -class URLRequestAboutJob : public URLRequestJob { +class URLRequestAboutJob : public net::URLRequestJob { public: explicit URLRequestAboutJob(net::URLRequest* request); diff --git a/net/url_request/url_request_data_job.cc b/net/url_request/url_request_data_job.cc index 3d9dace..c0a6e70 100644 --- a/net/url_request/url_request_data_job.cc +++ b/net/url_request/url_request_data_job.cc @@ -10,8 +10,8 @@ #include "net/url_request/url_request.h" // static -URLRequestJob* URLRequestDataJob::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* URLRequestDataJob::Factory(net::URLRequest* request, + const std::string& scheme) { return new URLRequestDataJob(request); } diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc index 1aeffac..c8f350b 100644 --- a/net/url_request/url_request_error_job.cc +++ b/net/url_request/url_request_error_job.cc @@ -9,7 +9,7 @@ #include "net/url_request/url_request_status.h" URLRequestErrorJob::URLRequestErrorJob(net::URLRequest* request, int error) - : URLRequestJob(request), error_(error) { + : net::URLRequestJob(request), error_(error) { } void URLRequestErrorJob::Start() { diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h index 6e7c879..58729c8 100644 --- a/net/url_request/url_request_error_job.h +++ b/net/url_request/url_request_error_job.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Invalid URLs go through this URLRequestJob class rather than being passed -// to the default job handler. +// Invalid URLs go through this net::URLRequestJob class rather than being +// passed to the default job handler. #ifndef NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_ #define NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_ @@ -11,7 +11,7 @@ #include "net/url_request/url_request_job.h" -class URLRequestErrorJob : public URLRequestJob { +class URLRequestErrorJob : public net::URLRequestJob { public: URLRequestErrorJob(net::URLRequest* request, int error); diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc index f58df6f..553add8 100644 --- a/net/url_request/url_request_file_dir_job.cc +++ b/net/url_request/url_request_file_dir_job.cc @@ -23,7 +23,7 @@ using std::string; URLRequestFileDirJob::URLRequestFileDirJob(net::URLRequest* request, const FilePath& dir_path) - : URLRequestJob(request), + : net::URLRequestJob(request), dir_path_(dir_path), canceled_(false), list_complete_(false), @@ -75,7 +75,7 @@ void URLRequestFileDirJob::Kill() { if (lister_) lister_->Cancel(); - URLRequestJob::Kill(); + net::URLRequestJob::Kill(); method_factory_.RevokeAll(); } diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h index 41fd9c1..bdb9b37 100644 --- a/net/url_request/url_request_file_dir_job.h +++ b/net/url_request/url_request_file_dir_job.h @@ -15,12 +15,12 @@ #include "net/url_request/url_request_job.h" class URLRequestFileDirJob - : public URLRequestJob, + : public net::URLRequestJob, public net::DirectoryLister::DirectoryListerDelegate { public: URLRequestFileDirJob(net::URLRequest* request, const FilePath& dir_path); - // URLRequestJob methods: + // net::URLRequestJob methods: virtual void Start(); virtual void StartAsync(); virtual void Kill(); diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index 01462c4..2061849 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -83,8 +83,8 @@ class URLRequestFileJob::AsyncResolver #endif // static -URLRequestJob* URLRequestFileJob::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* URLRequestFileJob::Factory(net::URLRequest* request, + const std::string& scheme) { FilePath file_path; const bool is_file = net::FileURLToFilePath(request->url(), &file_path); @@ -113,7 +113,7 @@ URLRequestJob* URLRequestFileJob::Factory(net::URLRequest* request, URLRequestFileJob::URLRequestFileJob(net::URLRequest* request, const FilePath& file_path) - : URLRequestJob(request), + : net::URLRequestJob(request), file_path_(file_path), ALLOW_THIS_IN_INITIALIZER_LIST( io_callback_(this, &URLRequestFileJob::DidRead)), @@ -166,7 +166,7 @@ void URLRequestFileJob::Kill() { } #endif - URLRequestJob::Kill(); + net::URLRequestJob::Kill(); method_factory_.RevokeAll(); } diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h index 342deeb..7fb6652 100644 --- a/net/url_request/url_request_file_job.h +++ b/net/url_request/url_request_file_job.h @@ -22,7 +22,7 @@ struct FileInfo; } // A request job that handles reading file URLs -class URLRequestFileJob : public URLRequestJob { +class URLRequestFileJob : public net::URLRequestJob { public: URLRequestFileJob(net::URLRequest* request, const FilePath& file_path); diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index c6d8ff1..0463278 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -17,7 +17,7 @@ #include "net/url_request/url_request_error_job.h" URLRequestFtpJob::URLRequestFtpJob(net::URLRequest* request) - : URLRequestJob(request), + : net::URLRequestJob(request), ALLOW_THIS_IN_INITIALIZER_LIST( start_callback_(this, &URLRequestFtpJob::OnStartCompleted)), ALLOW_THIS_IN_INITIALIZER_LIST( @@ -31,8 +31,8 @@ URLRequestFtpJob::~URLRequestFtpJob() { } // static -URLRequestJob* URLRequestFtpJob::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* URLRequestFtpJob::Factory(net::URLRequest* request, + const std::string& scheme) { DCHECK_EQ(scheme, "ftp"); int port = request->url().IntPort(); @@ -63,7 +63,7 @@ void URLRequestFtpJob::Kill() { if (!transaction_.get()) return; transaction_.reset(); - URLRequestJob::Kill(); + net::URLRequestJob::Kill(); method_factory_.RevokeAll(); } diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h index 708dc6d..c4b6fbd 100644 --- a/net/url_request/url_request_ftp_job.h +++ b/net/url_request/url_request_ftp_job.h @@ -18,23 +18,23 @@ class URLRequestContext; -// A URLRequestJob subclass that is built on top of FtpTransaction. It +// A net::URLRequestJob subclass that is built on top of FtpTransaction. It // provides an implementation for FTP. -class URLRequestFtpJob : public URLRequestJob { +class URLRequestFtpJob : public net::URLRequestJob { public: explicit URLRequestFtpJob(net::URLRequest* request); - static URLRequestJob* Factory(net::URLRequest* request, - const std::string& scheme); + static net::URLRequestJob* Factory(net::URLRequest* request, + const std::string& scheme); - // URLRequestJob methods: + // net::URLRequestJob methods: virtual bool GetMimeType(std::string* mime_type) const; private: virtual ~URLRequestFtpJob(); - // URLRequestJob methods: + // net::URLRequestJob methods: virtual void Start(); virtual void Kill(); virtual net::LoadState GetLoadState() const; diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index f2b1b4f..3a4bcd7 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -40,8 +40,8 @@ static const char kAvailDictionaryHeader[] = "Avail-Dictionary"; // TODO(darin): make sure the port blocking code is not lost // static -URLRequestJob* URLRequestHttpJob::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* URLRequestHttpJob::Factory(net::URLRequest* request, + const std::string& scheme) { DCHECK(scheme == "http" || scheme == "https"); int port = request->url().IntPort(); @@ -78,7 +78,7 @@ URLRequestJob* URLRequestHttpJob::Factory(net::URLRequest* request, } URLRequestHttpJob::URLRequestHttpJob(net::URLRequest* request) - : URLRequestJob(request), + : net::URLRequestJob(request), response_info_(NULL), response_cookies_save_index_(0), proxy_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH), @@ -168,7 +168,7 @@ void URLRequestHttpJob::Kill() { return; DestroyTransaction(); - URLRequestJob::Kill(); + net::URLRequestJob::Kill(); } net::LoadState URLRequestHttpJob::GetLoadState() const { @@ -622,7 +622,7 @@ void URLRequestHttpJob::NotifyHeadersComplete() { return; } - URLRequestJob::NotifyHeadersComplete(); + net::URLRequestJob::NotifyHeadersComplete(); } void URLRequestHttpJob::DestroyTransaction() { diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h index 471b406..6f2beaf 100644 --- a/net/url_request/url_request_http_job.h +++ b/net/url_request/url_request_http_job.h @@ -24,17 +24,17 @@ class HttpTransaction; } class URLRequestContext; -// A URLRequestJob subclass that is built on top of HttpTransaction. It +// A net::URLRequestJob subclass that is built on top of HttpTransaction. It // provides an implementation for both HTTP and HTTPS. -class URLRequestHttpJob : public URLRequestJob { +class URLRequestHttpJob : public net::URLRequestJob { public: - static URLRequestJob* Factory(net::URLRequest* request, - const std::string& scheme); + static net::URLRequestJob* Factory(net::URLRequest* request, + const std::string& scheme); protected: explicit URLRequestHttpJob(net::URLRequest* request); - // URLRequestJob methods: + // net::URLRequestJob methods: virtual void SetUpload(net::UploadData* upload); virtual void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers); virtual void Start(); @@ -61,7 +61,7 @@ class URLRequestHttpJob : public URLRequestJob { virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read); virtual void StopCaching(); - // Shadows URLRequestJob's version of this method so we can grab cookies. + // Shadows net::URLRequestJob's version of this method so we can grab cookies. void NotifyHeadersComplete(); void DestroyTransaction(); diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index 1b56b50..0c54c10 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -21,12 +21,12 @@ using base::Time; using base::TimeTicks; +namespace net { + // Buffer size allocated when de-compressing data. // static const int URLRequestJob::kFilterBufSize = 32 * 1024; -namespace net { - URLRequestJob::URLRequestJob(URLRequest* request) : request_(request), prefilter_bytes_read_(0), diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index ab54354..0d0f356 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -426,6 +426,4 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>, } // namespace net -typedef net::URLRequestJob URLRequestJob; - #endif // NET_URL_REQUEST_URL_REQUEST_JOB_H_ diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc index 117c15a..914be05 100644 --- a/net/url_request/url_request_job_manager.cc +++ b/net/url_request/url_request_job_manager.cc @@ -51,7 +51,8 @@ URLRequestJobManager* URLRequestJobManager::GetInstance() { return Singleton<URLRequestJobManager>::get(); } -URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const { +net::URLRequestJob* URLRequestJobManager::CreateJob( + net::URLRequest* request) const { #ifndef NDEBUG DCHECK(IsAllowedThread()); #endif @@ -73,7 +74,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const { if (!(request->load_flags() & net::LOAD_DISABLE_INTERCEPT)) { InterceptorList::const_iterator i; for (i = interceptors_.begin(); i != interceptors_.end(); ++i) { - URLRequestJob* job = (*i)->MaybeIntercept(request); + net::URLRequestJob* job = (*i)->MaybeIntercept(request); if (job) return job; } @@ -84,7 +85,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const { // built-in protocol factory. FactoryMap::const_iterator i = factories_.find(scheme); if (i != factories_.end()) { - URLRequestJob* job = i->second(request, scheme); + net::URLRequestJob* job = i->second(request, scheme); if (job) return job; } @@ -92,7 +93,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const { // See if the request should be handled by a built-in protocol factory. for (size_t i = 0; i < arraysize(kBuiltinFactories); ++i) { if (scheme == kBuiltinFactories[i].scheme) { - URLRequestJob* job = (kBuiltinFactories[i].factory)(request, scheme); + net::URLRequestJob* job = (kBuiltinFactories[i].factory)(request, scheme); DCHECK(job); // The built-in factories are not expected to fail! return job; } @@ -105,7 +106,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const { return new URLRequestErrorJob(request, net::ERR_FAILED); } -URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect( +net::URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect( net::URLRequest* request, const GURL& location) const { #ifndef NDEBUG @@ -119,14 +120,14 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect( InterceptorList::const_iterator i; for (i = interceptors_.begin(); i != interceptors_.end(); ++i) { - URLRequestJob* job = (*i)->MaybeInterceptRedirect(request, location); + net::URLRequestJob* job = (*i)->MaybeInterceptRedirect(request, location); if (job) return job; } return NULL; } -URLRequestJob* URLRequestJobManager::MaybeInterceptResponse( +net::URLRequestJob* URLRequestJobManager::MaybeInterceptResponse( net::URLRequest* request) const { #ifndef NDEBUG DCHECK(IsAllowedThread()); @@ -139,7 +140,7 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptResponse( InterceptorList::const_iterator i; for (i = interceptors_.begin(); i != interceptors_.end(); ++i) { - URLRequestJob* job = (*i)->MaybeInterceptResponse(request); + net::URLRequestJob* job = (*i)->MaybeInterceptResponse(request); if (job) return job; } diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h index 1e56b12..0fb18ba 100644 --- a/net/url_request/url_request_job_manager.h +++ b/net/url_request/url_request_job_manager.h @@ -17,7 +17,7 @@ template <typename T> struct DefaultSingletonTraits; // This class is responsible for managing the set of protocol factories and -// request interceptors that determine how an URLRequestJob gets created to +// request interceptors that determine how an net::URLRequestJob gets created to // handle an net::URLRequest. // // MULTI-THREADING NOTICE: @@ -32,7 +32,7 @@ class URLRequestJobManager { // Returns the singleton instance. static URLRequestJobManager* GetInstance(); - // Instantiate an URLRequestJob implementation based on the registered + // Instantiate an net::URLRequestJob implementation based on the registered // interceptors and protocol factories. This will always succeed in // returning a job unless we are--in the extreme case--out of memory. net::URLRequestJob* CreateJob(net::URLRequest* request) const; diff --git a/net/url_request/url_request_job_metrics.h b/net/url_request/url_request_job_metrics.h index ce0e4bf..7736859 100644 --- a/net/url_request/url_request_job_metrics.h +++ b/net/url_request/url_request_job_metrics.h @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Records IO statistics associated with a URLRequestJob. +// Records IO statistics associated with a net::URLRequestJob. // See description in navigation_profiler.h for an overview of perf profiling. #ifndef NET_URL_REQUEST_URL_REQUEST_JOB_METRICS_H_ diff --git a/net/url_request/url_request_job_tracker.cc b/net/url_request/url_request_job_tracker.cc index f7ef904..3a8b6a1 100644 --- a/net/url_request/url_request_job_tracker.cc +++ b/net/url_request/url_request_job_tracker.cc @@ -16,17 +16,17 @@ URLRequestJobTracker::URLRequestJobTracker() { URLRequestJobTracker::~URLRequestJobTracker() { DLOG_IF(WARNING, active_jobs_.size() != 0) << - "Leaking " << active_jobs_.size() << " URLRequestJob object(s), this could " - "be because the net::URLRequest forgot to free it (bad), or if the program " - "was terminated while a request was active (normal)."; + "Leaking " << active_jobs_.size() << " net::URLRequestJob object(s), this " + "could be because the net::URLRequest forgot to free it (bad), or if the " + "program was terminated while a request was active (normal)."; } -void URLRequestJobTracker::AddNewJob(URLRequestJob* job) { +void URLRequestJobTracker::AddNewJob(net::URLRequestJob* job) { active_jobs_.push_back(job); FOR_EACH_OBSERVER(JobObserver, observers_, OnJobAdded(job)); } -void URLRequestJobTracker::RemoveJob(URLRequestJob* job) { +void URLRequestJobTracker::RemoveJob(net::URLRequestJob* job) { JobList::iterator iter = std::find(active_jobs_.begin(), active_jobs_.end(), job); if (iter == active_jobs_.end()) { @@ -38,19 +38,19 @@ void URLRequestJobTracker::RemoveJob(URLRequestJob* job) { FOR_EACH_OBSERVER(JobObserver, observers_, OnJobRemoved(job)); } -void URLRequestJobTracker::OnJobDone(URLRequestJob* job, +void URLRequestJobTracker::OnJobDone(net::URLRequestJob* job, const URLRequestStatus& status) { FOR_EACH_OBSERVER(JobObserver, observers_, OnJobDone(job, status)); } -void URLRequestJobTracker::OnJobRedirect(URLRequestJob* job, +void URLRequestJobTracker::OnJobRedirect(net::URLRequestJob* job, const GURL& location, int status_code) { FOR_EACH_OBSERVER(JobObserver, observers_, OnJobRedirect(job, location, status_code)); } -void URLRequestJobTracker::OnBytesRead(URLRequestJob* job, +void URLRequestJobTracker::OnBytesRead(net::URLRequestJob* job, const char* buf, int byte_count) { FOR_EACH_OBSERVER(JobObserver, observers_, diff --git a/net/url_request/url_request_job_tracker_unittest.cc b/net/url_request/url_request_job_tracker_unittest.cc index 21b72c6..fb257e7 100644 --- a/net/url_request/url_request_job_tracker_unittest.cc +++ b/net/url_request/url_request_job_tracker_unittest.cc @@ -51,27 +51,27 @@ bool GetResponseBody(const GURL& url, std::string* out_body) { class MockJobObserver : public URLRequestJobTracker::JobObserver { public: - MOCK_METHOD1(OnJobAdded, void(URLRequestJob* job)); - MOCK_METHOD1(OnJobRemoved, void(URLRequestJob* job)); - MOCK_METHOD2(OnJobDone, void(URLRequestJob* job, + MOCK_METHOD1(OnJobAdded, void(net::URLRequestJob* job)); + MOCK_METHOD1(OnJobRemoved, void(net::URLRequestJob* job)); + MOCK_METHOD2(OnJobDone, void(net::URLRequestJob* job, const URLRequestStatus& status)); - MOCK_METHOD3(OnJobRedirect, void(URLRequestJob* job, + MOCK_METHOD3(OnJobRedirect, void(net::URLRequestJob* job, const GURL& location, int status_code)); - MOCK_METHOD3(OnBytesRead, void(URLRequestJob* job, + MOCK_METHOD3(OnBytesRead, void(net::URLRequestJob* job, const char* buf, int byte_count)); }; -// A URLRequestJob that returns static content for given URLs. We do +// A net::URLRequestJob that returns static content for given URLs. We do // not use URLRequestTestJob here because URLRequestTestJob fakes // async operations by calling ReadRawData synchronously in an async -// callback. This test requires a URLRequestJob that returns false for +// callback. This test requires a net::URLRequestJob that returns false for // async reads, in order to exercise the real async read codepath. -class URLRequestJobTrackerTestJob : public URLRequestJob { +class URLRequestJobTrackerTestJob : public net::URLRequestJob { public: URLRequestJobTrackerTestJob(net::URLRequest* request, bool async_reads) - : URLRequestJob(request), async_reads_(async_reads) {} + : net::URLRequestJob(request), async_reads_(async_reads) {} void Start() { ASSERT_TRUE(GetResponseBody(request_->url(), &response_data_)); @@ -125,7 +125,7 @@ class URLRequestJobTrackerTestJob : public URLRequestJob { encoding_types->push_back(Filter::FILTER_TYPE_GZIP); return true; } else { - return URLRequestJob::GetContentEncodings(encoding_types); + return net::URLRequestJob::GetContentEncodings(encoding_types); } } @@ -201,8 +201,9 @@ class URLRequestJobTrackerTest : public PlatformTest { }; // static -URLRequestJob* URLRequestJobTrackerTest::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* URLRequestJobTrackerTest::Factory( + net::URLRequest* request, + const std::string& scheme) { return new URLRequestJobTrackerTestJob(request, g_async_reads); } diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc index 05d18a6..a6cd025 100644 --- a/net/url_request/url_request_redirect_job.cc +++ b/net/url_request/url_request_redirect_job.cc @@ -8,7 +8,7 @@ URLRequestRedirectJob::URLRequestRedirectJob(net::URLRequest* request, GURL redirect_destination) - : URLRequestJob(request), redirect_destination_(redirect_destination) { + : net::URLRequestJob(request), redirect_destination_(redirect_destination) { } void URLRequestRedirectJob::Start() { diff --git a/net/url_request/url_request_redirect_job.h b/net/url_request/url_request_redirect_job.h index bc10eee..4a7f9a7 100644 --- a/net/url_request/url_request_redirect_job.h +++ b/net/url_request/url_request_redirect_job.h @@ -10,10 +10,10 @@ class GURL; -// A URLRequestJob that will redirect the request to the specified +// A net::URLRequestJob that will redirect the request to the specified // URL. This is useful to restart a request at a different URL based // on the result of another job. -class URLRequestRedirectJob : public URLRequestJob { +class URLRequestRedirectJob : public net::URLRequestJob { public: // Constructs a job that redirects to the specified URL. URLRequestRedirectJob(net::URLRequest* request, GURL redirect_destination); diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc index 38e0c4d..a6b0f5d 100644 --- a/net/url_request/url_request_simple_job.cc +++ b/net/url_request/url_request_simple_job.cc @@ -10,7 +10,7 @@ #include "net/url_request/url_request_status.h" URLRequestSimpleJob::URLRequestSimpleJob(net::URLRequest* request) - : URLRequestJob(request), + : net::URLRequestJob(request), data_offset_(0) { } diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc index c1081ff..7fd019c 100644 --- a/net/url_request/url_request_test_job.cc +++ b/net/url_request/url_request_test_job.cc @@ -70,13 +70,13 @@ std::string URLRequestTestJob::test_error_headers() { } // static -URLRequestJob* URLRequestTestJob::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* URLRequestTestJob::Factory(net::URLRequest* request, + const std::string& scheme) { return new URLRequestTestJob(request); } URLRequestTestJob::URLRequestTestJob(net::URLRequest* request) - : URLRequestJob(request), + : net::URLRequestJob(request), auto_advance_(false), stage_(WAITING), offset_(0), @@ -86,7 +86,7 @@ URLRequestTestJob::URLRequestTestJob(net::URLRequest* request) URLRequestTestJob::URLRequestTestJob(net::URLRequest* request, bool auto_advance) - : URLRequestJob(request), + : net::URLRequestJob(request), auto_advance_(auto_advance), stage_(WAITING), offset_(0), @@ -98,7 +98,7 @@ URLRequestTestJob::URLRequestTestJob(net::URLRequest* request, const std::string& response_headers, const std::string& response_data, bool auto_advance) - : URLRequestJob(request), + : net::URLRequestJob(request), auto_advance_(auto_advance), stage_(WAITING), response_headers_(new net::HttpResponseHeaders(response_headers)), @@ -207,7 +207,7 @@ bool URLRequestTestJob::IsRedirectResponse(GURL* location, void URLRequestTestJob::Kill() { stage_ = DONE; - URLRequestJob::Kill(); + net::URLRequestJob::Kill(); } void URLRequestTestJob::ProcessNextOperation() { diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index eaee403..4be2ec5 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -1879,7 +1879,7 @@ class TestInterceptor : net::URLRequest::Interceptor { net::URLRequest::UnregisterRequestInterceptor(this); } - virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) { + virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request) { if (restart_main_request_) { restart_main_request_ = false; did_restart_main_ = true; @@ -1911,8 +1911,8 @@ class TestInterceptor : net::URLRequest::Interceptor { true); } - virtual URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request, - const GURL& location) { + virtual net::URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request, + const GURL& location) { if (cancel_redirect_request_) { cancel_redirect_request_ = false; did_cancel_redirect_ = true; @@ -1928,7 +1928,7 @@ class TestInterceptor : net::URLRequest::Interceptor { true); } - virtual URLRequestJob* MaybeInterceptResponse(net::URLRequest* request) { + virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request) { if (cancel_final_request_) { cancel_final_request_ = false; did_cancel_final_ = true; |