| Index: net/url_request/url_request.h
|
| diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
|
| index 3561a294624dccccc8eeb5d653a794eb13b10034..f257ed6d6222156edcdd032ba08eb117cf2f3702 100644
|
| --- a/net/url_request/url_request.h
|
| +++ b/net/url_request/url_request.h
|
| @@ -58,6 +58,21 @@ class X509Certificate;
|
| //
|
| class URLRequest : public base::NonThreadSafe {
|
| public:
|
| + // Callback function implemented by protocol handlers to create new jobs.
|
| + // The factory may return NULL to indicate an error, which will cause other
|
| + // factories to be queried. If no factory handles the request, then the
|
| + // default job will be used.
|
| + typedef URLRequestJob* (ProtocolFactory)(URLRequest* request,
|
| + const std::string& scheme);
|
| +
|
| + // HTTP request/response header IDs (via some preprocessor fun) for use with
|
| + // SetRequestHeaderById and GetResponseHeaderById.
|
| + enum {
|
| +#define HTTP_ATOM(x) HTTP_ ## x,
|
| +#include "net/http/http_atom_list.h"
|
| +#undef HTTP_ATOM
|
| + };
|
| +
|
| // Derive from this class and add your own data members to associate extra
|
| // information with a URLRequest. Use GetUserData(key) and SetUserData()
|
| class UserData {
|
| @@ -66,13 +81,6 @@ class URLRequest : public base::NonThreadSafe {
|
| virtual ~UserData() {}
|
| };
|
|
|
| - // Callback function implemented by protocol handlers to create new jobs.
|
| - // The factory may return NULL to indicate an error, which will cause other
|
| - // factories to be queried. If no factory handles the request, then the
|
| - // default job will be used.
|
| - typedef URLRequestJob* (ProtocolFactory)(URLRequest* request,
|
| - const std::string& scheme);
|
| -
|
| // This class handles network interception. Use with
|
| // (Un)RegisterRequestInterceptor.
|
| class Interceptor {
|
| @@ -509,14 +517,6 @@ class URLRequest : public base::NonThreadSafe {
|
| // cancel the request instead, call Cancel().
|
| void ContinueDespiteLastError();
|
|
|
| - // HTTP request/response header IDs (via some preprocessor fun) for use with
|
| - // SetRequestHeaderById and GetResponseHeaderById.
|
| - enum {
|
| -#define HTTP_ATOM(x) HTTP_ ## x,
|
| -#include "net/http/http_atom_list.h"
|
| -#undef HTTP_ATOM
|
| - };
|
| -
|
| // Returns true if performance profiling should be enabled on the
|
| // URLRequestJob serving this request.
|
| bool enable_profiling() const { return enable_profiling_; }
|
| @@ -568,6 +568,7 @@ class URLRequest : public base::NonThreadSafe {
|
|
|
| private:
|
| friend class URLRequestJob;
|
| + typedef std::map<const void*, linked_ptr<UserData> > UserDataMap;
|
|
|
| void StartJob(URLRequestJob* job);
|
|
|
| @@ -620,7 +621,6 @@ class URLRequest : public base::NonThreadSafe {
|
| bool is_pending_;
|
|
|
| // Externally-defined data accessible by key
|
| - typedef std::map<const void*, linked_ptr<UserData> > UserDataMap;
|
| UserDataMap user_data_;
|
|
|
| // Whether to enable performance profiling on the job serving this request.
|
|
|