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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_request_test_util.h

Issue 11410066: Revert 167337 - Move url_request_test_util into net namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_job_unittest.cc ('k') | net/url_request/url_request_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_test_util.h
===================================================================
--- net/url_request/url_request_test_util.h (revision 167354)
+++ net/url_request/url_request_test_util.h (working copy)
@@ -41,11 +41,9 @@
using base::TimeDelta;
-namespace net {
-
//-----------------------------------------------------------------------------
-class TestURLRequestContext : public URLRequestContext {
+class TestURLRequestContext : public net::URLRequestContext {
public:
TestURLRequestContext();
// Default constructor like TestURLRequestContext() but does not call
@@ -61,14 +59,14 @@
bool initialized_;
protected:
- URLRequestContextStorage context_storage_;
+ net::URLRequestContextStorage context_storage_;
};
//-----------------------------------------------------------------------------
// Used to return a dummy context, which lives on the message loop
// given in the constructor.
-class TestURLRequestContextGetter : public URLRequestContextGetter {
+class TestURLRequestContextGetter : public net::URLRequestContextGetter {
public:
// |network_task_runner| must not be NULL.
explicit TestURLRequestContextGetter(
@@ -79,7 +77,7 @@
const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner,
scoped_ptr<TestURLRequestContext> context);
- // URLRequestContextGetter implementation.
+ // net::URLRequestContextGetter implementation.
virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE;
virtual scoped_refptr<base::SingleThreadTaskRunner>
GetNetworkTaskRunner() const OVERRIDE;
@@ -94,7 +92,7 @@
//-----------------------------------------------------------------------------
-class TestURLRequest : public URLRequest {
+class TestURLRequest : public net::URLRequest {
public:
TestURLRequest(
const GURL& url, Delegate* delegate, TestURLRequestContext* context);
@@ -103,7 +101,7 @@
//-----------------------------------------------------------------------------
-class TestDelegate : public URLRequest::Delegate {
+class TestDelegate : public net::URLRequest::Delegate {
public:
TestDelegate();
virtual ~TestDelegate();
@@ -119,7 +117,7 @@
void set_allow_certificate_errors(bool val) {
allow_certificate_errors_ = val;
}
- void set_credentials(const AuthCredentials& credentials) {
+ void set_credentials(const net::AuthCredentials& credentials) {
credentials_ = credentials;
}
@@ -138,25 +136,25 @@
}
bool auth_required_called() const { return auth_required_; }
- // URLRequest::Delegate:
- virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url,
+ // net::URLRequest::Delegate:
+ virtual void OnReceivedRedirect(net::URLRequest* request, const GURL& new_url,
bool* defer_redirect) OVERRIDE;
- virtual void OnAuthRequired(URLRequest* request,
- AuthChallengeInfo* auth_info) OVERRIDE;
+ virtual void OnAuthRequired(net::URLRequest* request,
+ net::AuthChallengeInfo* auth_info) OVERRIDE;
// NOTE: |fatal| causes |certificate_errors_are_fatal_| to be set to true.
// (Unit tests use this as a post-condition.) But for policy, this method
// consults |allow_certificate_errors_|.
- virtual void OnSSLCertificateError(URLRequest* request,
- const SSLInfo& ssl_info,
+ virtual void OnSSLCertificateError(net::URLRequest* request,
+ const net::SSLInfo& ssl_info,
bool fatal) OVERRIDE;
- virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
- virtual void OnReadCompleted(URLRequest* request,
+ virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+ virtual void OnReadCompleted(net::URLRequest* request,
int bytes_read) OVERRIDE;
private:
static const int kBufferSize = 4096;
- virtual void OnResponseCompleted(URLRequest* request);
+ virtual void OnResponseCompleted(net::URLRequest* request);
// options for controlling behavior
bool cancel_in_rr_;
@@ -166,7 +164,7 @@
bool quit_on_complete_;
bool quit_on_redirect_;
bool allow_certificate_errors_;
- AuthCredentials credentials_;
+ net::AuthCredentials credentials_;
// tracks status of callbacks
int response_started_count_;
@@ -180,12 +178,12 @@
std::string data_received_;
// our read buffer
- scoped_refptr<IOBuffer> buf_;
+ scoped_refptr<net::IOBuffer> buf_;
};
//-----------------------------------------------------------------------------
-class TestNetworkDelegate : public NetworkDelegate {
+class TestNetworkDelegate : public net::NetworkDelegate {
public:
enum Options {
NO_GET_COOKIES = 1 << 0,
@@ -207,47 +205,48 @@
int set_cookie_count() const { return set_cookie_count_; }
protected:
- // NetworkDelegate:
- virtual int OnBeforeURLRequest(URLRequest* request,
- const CompletionCallback& callback,
+ // net::NetworkDelegate:
+ virtual int OnBeforeURLRequest(net::URLRequest* request,
+ const net::CompletionCallback& callback,
GURL* new_url) OVERRIDE;
- virtual int OnBeforeSendHeaders(URLRequest* request,
- const CompletionCallback& callback,
- HttpRequestHeaders* headers) OVERRIDE;
- virtual void OnSendHeaders(URLRequest* request,
- const HttpRequestHeaders& headers) OVERRIDE;
+ virtual int OnBeforeSendHeaders(net::URLRequest* request,
+ const net::CompletionCallback& callback,
+ net::HttpRequestHeaders* headers) OVERRIDE;
+ virtual void OnSendHeaders(net::URLRequest* request,
+ const net::HttpRequestHeaders& headers) OVERRIDE;
virtual int OnHeadersReceived(
- URLRequest* request,
- const CompletionCallback& callback,
- const HttpResponseHeaders* original_response_headers,
- scoped_refptr<HttpResponseHeaders>* override_response_headers) OVERRIDE;
- virtual void OnBeforeRedirect(URLRequest* request,
+ net::URLRequest* request,
+ const net::CompletionCallback& callback,
+ const net::HttpResponseHeaders* original_response_headers,
+ scoped_refptr<net::HttpResponseHeaders>* override_response_headers)
+ OVERRIDE;
+ virtual void OnBeforeRedirect(net::URLRequest* request,
const GURL& new_location) OVERRIDE;
- virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
- virtual void OnRawBytesRead(const URLRequest& request,
+ virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+ virtual void OnRawBytesRead(const net::URLRequest& request,
int bytes_read) OVERRIDE;
- virtual void OnCompleted(URLRequest* request, bool started) OVERRIDE;
- virtual void OnURLRequestDestroyed(URLRequest* request) OVERRIDE;
+ virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE;
+ virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE;
virtual void OnPACScriptError(int line_number,
const string16& error) OVERRIDE;
- virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired(
- URLRequest* request,
- const AuthChallengeInfo& auth_info,
+ virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
+ net::URLRequest* request,
+ const net::AuthChallengeInfo& auth_info,
const AuthCallback& callback,
- AuthCredentials* credentials) OVERRIDE;
- virtual bool OnCanGetCookies(const URLRequest& request,
- const CookieList& cookie_list) OVERRIDE;
- virtual bool OnCanSetCookie(const URLRequest& request,
+ net::AuthCredentials* credentials) OVERRIDE;
+ virtual bool OnCanGetCookies(const net::URLRequest& request,
+ const net::CookieList& cookie_list) OVERRIDE;
+ virtual bool OnCanSetCookie(const net::URLRequest& request,
const std::string& cookie_line,
- CookieOptions* options) OVERRIDE;
- virtual bool OnCanAccessFile(const URLRequest& request,
+ net::CookieOptions* options) OVERRIDE;
+ virtual bool OnCanAccessFile(const net::URLRequest& request,
const FilePath& path) const OVERRIDE;
virtual bool OnCanThrottleRequest(
- const URLRequest& request) const OVERRIDE;
+ const net::URLRequest& request) const OVERRIDE;
virtual int OnBeforeSocketStreamConnect(
- SocketStream* stream,
- const CompletionCallback& callback) OVERRIDE;
- virtual void OnRequestWaitStateChange(const URLRequest& request,
+ net::SocketStream* stream,
+ const net::CompletionCallback& callback) OVERRIDE;
+ virtual void OnRequestWaitStateChange(const net::URLRequest& request,
RequestWaitState state) OVERRIDE;
void InitRequestStatesIfNew(int request_id);
@@ -262,7 +261,7 @@
int blocked_set_cookie_count_;
int set_cookie_count_;
- // NetworkDelegate callbacks happen in a particular order (e.g.
+ // net::NetworkDelegate callbacks happen in a particular order (e.g.
// OnBeforeURLRequest is always called before OnBeforeSendHeaders).
// This bit-set indicates for each request id (key) what events may be sent
// next.
@@ -301,26 +300,24 @@
//-----------------------------------------------------------------------------
// A simple Interceptor that returns a pre-built URLRequestJob only once.
-class TestJobInterceptor : public URLRequestJobFactory::Interceptor {
+class TestJobInterceptor : public net::URLRequestJobFactory::Interceptor {
public:
TestJobInterceptor();
- virtual URLRequestJob* MaybeIntercept(
- URLRequest* request,
- NetworkDelegate* network_delegate) const OVERRIDE;
- virtual URLRequestJob* MaybeInterceptRedirect(
+ virtual net::URLRequestJob* MaybeIntercept(
+ net::URLRequest* request,
+ net::NetworkDelegate* network_delegate) const OVERRIDE;
+ virtual net::URLRequestJob* MaybeInterceptRedirect(
const GURL& location,
- URLRequest* request,
- NetworkDelegate* network_delegate) const OVERRIDE;
- virtual URLRequestJob* MaybeInterceptResponse(
- URLRequest* request,
- NetworkDelegate* network_delegate) const OVERRIDE;
- void set_main_intercept_job(URLRequestJob* job);
+ net::URLRequest* request,
+ net::NetworkDelegate* network_delegate) const OVERRIDE;
+ virtual net::URLRequestJob* MaybeInterceptResponse(
+ net::URLRequest* request,
+ net::NetworkDelegate* network_delegate) const OVERRIDE;
+ void set_main_intercept_job(net::URLRequestJob* job);
private:
- mutable URLRequestJob* main_intercept_job_;
+ mutable net::URLRequestJob* main_intercept_job_;
};
-} // namespace net
-
#endif // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
« no previous file with comments | « net/url_request/url_request_job_unittest.cc ('k') | net/url_request/url_request_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698