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

Unified Diff: net/url_request/url_request_intercepting_job_factory.h

Issue 2406273002: [Cronet] Test the libcronet that's shipped, not libcronet_test (Closed)
Patch Set: fix shutdown race Created 4 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
Index: net/url_request/url_request_intercepting_job_factory.h
diff --git a/net/url_request/url_request_intercepting_job_factory.h b/net/url_request/url_request_intercepting_job_factory.h
index e4d616a3b20c1b7b11f33800bd3359278c711801..f6bd70ec23b7a83095ad4cd442209f54f5290188 100644
--- a/net/url_request/url_request_intercepting_job_factory.h
+++ b/net/url_request/url_request_intercepting_job_factory.h
@@ -32,9 +32,14 @@ class URLRequestInterceptor;
class NET_EXPORT URLRequestInterceptingJobFactory
: public URLRequestJobFactory {
public:
+ // Takes ownership of |job_factory| and |interceptor|.
URLRequestInterceptingJobFactory(
std::unique_ptr<URLRequestJobFactory> job_factory,
std::unique_ptr<URLRequestInterceptor> interceptor);
+ // Does not take ownership of |job_factory| and |interceptor|. Necessary if
+ // ownership is held elsewhere.
+ URLRequestInterceptingJobFactory(URLRequestJobFactory* job_factory,
+ URLRequestInterceptor* interceptor);
~URLRequestInterceptingJobFactory() override;
// URLRequestJobFactory implementation
@@ -57,8 +62,10 @@ class NET_EXPORT URLRequestInterceptingJobFactory
bool IsSafeRedirectTarget(const GURL& location) const override;
private:
- std::unique_ptr<URLRequestJobFactory> job_factory_;
- std::unique_ptr<URLRequestInterceptor> interceptor_;
+ // |owning_| indicates if this object owns |job_factory_| and |interceptor_|.
+ bool owning_;
+ URLRequestJobFactory* job_factory_;
+ URLRequestInterceptor* interceptor_;
DISALLOW_COPY_AND_ASSIGN(URLRequestInterceptingJobFactory);
};

Powered by Google App Engine
This is Rietveld 408576698