| Index: chrome/browser/sync/glue/http_bridge.h
|
| diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
|
| index 3e7e98eda04aff997424c69eebae748cda1df228..a26410d2241d8d47eef2e29563c0f4b9956af6a1 100644
|
| --- a/chrome/browser/sync/glue/http_bridge.h
|
| +++ b/chrome/browser/sync/glue/http_bridge.h
|
| @@ -51,6 +51,9 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
|
| // currently active profile.
|
| explicit RequestContext(net::URLRequestContext* baseline_context);
|
|
|
| + // The destructor MUST be called on the IO thread.
|
| + virtual ~RequestContext();
|
| +
|
| // Set the user agent for requests using this context. The default is
|
| // the browser's UA string.
|
| void set_user_agent(const std::string& ua) { user_agent_ = ua; }
|
| @@ -63,9 +66,6 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
|
| }
|
|
|
| private:
|
| - // The destructor MUST be called on the IO thread.
|
| - virtual ~RequestContext();
|
| -
|
| std::string user_agent_;
|
| net::URLRequestContext* baseline_context_;
|
|
|
| @@ -96,7 +96,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
|
| scoped_refptr<net::URLRequestContextGetter> baseline_context_getter_;
|
|
|
| // Lazily initialized by GetURLRequestContext().
|
| - scoped_refptr<RequestContext> context_;
|
| + scoped_ptr<RequestContext> context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RequestContextGetter);
|
| };
|
|
|