| Index: chrome/browser/sync/glue/http_bridge.cc
|
| diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
|
| index 469315331b5216443d0ba0c16efa41e2ff70c915..265a044210c5c77f5059c23a4124705fbc371420 100644
|
| --- a/chrome/browser/sync/glue/http_bridge.cc
|
| +++ b/chrome/browser/sync/glue/http_bridge.cc
|
| @@ -26,10 +26,11 @@ HttpBridge::RequestContextGetter::RequestContextGetter(
|
| : baseline_context_getter_(baseline_context_getter) {
|
| }
|
|
|
| -URLRequestContext* HttpBridge::RequestContextGetter::GetURLRequestContext() {
|
| +net::URLRequestContext*
|
| +HttpBridge::RequestContextGetter::GetURLRequestContext() {
|
| // Lazily create the context.
|
| if (!context_) {
|
| - URLRequestContext* baseline_context =
|
| + net::URLRequestContext* baseline_context =
|
| baseline_context_getter_->GetURLRequestContext();
|
| context_ = new RequestContext(baseline_context);
|
| baseline_context_getter_ = NULL;
|
| @@ -67,7 +68,8 @@ void HttpBridgeFactory::Destroy(sync_api::HttpPostProviderInterface* http) {
|
| static_cast<HttpBridge*>(http)->Release();
|
| }
|
|
|
| -HttpBridge::RequestContext::RequestContext(URLRequestContext* baseline_context)
|
| +HttpBridge::RequestContext::RequestContext(
|
| + net::URLRequestContext* baseline_context)
|
| : baseline_context_(baseline_context) {
|
|
|
| // Create empty, in-memory cookie store.
|
|
|