| Index: chrome/browser/net/url_request_mock_http_job.h
|
| diff --git a/chrome/browser/net/url_request_mock_http_job.h b/chrome/browser/net/url_request_mock_http_job.h
|
| index 35a251c134741b280db6ef2479e5bf44c9ab9990..d2c0e0bd963a580af57525d996c144fc6efe73f7 100644
|
| --- a/chrome/browser/net/url_request_mock_http_job.h
|
| +++ b/chrome/browser/net/url_request_mock_http_job.h
|
| @@ -16,14 +16,14 @@ class FilePath;
|
|
|
| class URLRequestMockHTTPJob : public URLRequestFileJob {
|
| public:
|
| - URLRequestMockHTTPJob(URLRequest* request, const FilePath& file_path);
|
| + URLRequestMockHTTPJob(net::URLRequest* request, const FilePath& file_path);
|
|
|
| virtual bool GetMimeType(std::string* mime_type) const;
|
| virtual bool GetCharset(std::string* charset);
|
| virtual void GetResponseInfo(net::HttpResponseInfo* info);
|
| virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
|
|
|
| - static URLRequest::ProtocolFactory Factory;
|
| + static net::URLRequest::ProtocolFactory Factory;
|
|
|
| // Adds the testing URLs to the URLRequestFilter.
|
| static void AddUrlHandler(const FilePath& base_path);
|
| @@ -39,7 +39,7 @@ class URLRequestMockHTTPJob : public URLRequestFileJob {
|
| virtual ~URLRequestMockHTTPJob() { }
|
|
|
| static FilePath GetOnDiskPath(const FilePath& base_path,
|
| - URLRequest* request,
|
| + net::URLRequest* request,
|
| const std::string& scheme);
|
|
|
| private:
|
|
|