| Index: chrome/browser/component_updater/component_updater_interceptor.h
|
| diff --git a/chrome/browser/component_updater/component_updater_interceptor.h b/chrome/browser/component_updater/component_updater_interceptor.h
|
| index 67b91992782e6639d4ef41054635f55260f4f7c6..d34a76ba1de286e1a5512d5134884c8e470f5df1 100644
|
| --- a/chrome/browser/component_updater/component_updater_interceptor.h
|
| +++ b/chrome/browser/component_updater/component_updater_interceptor.h
|
| @@ -10,8 +10,9 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/file_path.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "googleurl/src/gurl.h"
|
| -#include "net/url_request/url_request.h"
|
| +#include "net/url_request/url_request_job_factory.h"
|
|
|
| #if !defined(UNIT_TEST)
|
| #error "use this class only in unit tests"
|
| @@ -20,7 +21,7 @@
|
| // This url request interceptor lets us respond to localhost http request urls
|
| // with the contents of files on disk for use in tests.
|
| class ComponentUpdateInterceptor
|
| - : public net::URLRequest::Interceptor,
|
| + : public net::URLRequestJobFactory::ProtocolHandler,
|
| public base::RefCountedThreadSafe<ComponentUpdateInterceptor> {
|
| public:
|
| ComponentUpdateInterceptor();
|
| @@ -37,13 +38,15 @@ class ComponentUpdateInterceptor
|
|
|
| private:
|
| // When computing matches, this ignores the query parameters of the url.
|
| - virtual net::URLRequestJob* MaybeIntercept(
|
| + virtual net::URLRequestJob* MaybeCreateJob(
|
| net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate) OVERRIDE;
|
| + net::NetworkDelegate* network_delegate) const OVERRIDE;
|
|
|
| friend class base::RefCountedThreadSafe<ComponentUpdateInterceptor>;
|
|
|
| virtual ~ComponentUpdateInterceptor();
|
| + void Register();
|
| + static void Unregister();
|
|
|
| struct Response {
|
| FilePath data_path;
|
| @@ -52,7 +55,7 @@ class ComponentUpdateInterceptor
|
|
|
| typedef std::map<GURL, Response> ResponseMap;
|
| ResponseMap responses_;
|
| - int hit_count_;
|
| + mutable int hit_count_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ComponentUpdateInterceptor);
|
| };
|
|
|