7 files changed, 21 insertions, 17 deletions
diff --git a/sync/internal_api/http_bridge.cc b/sync/internal_api/http_bridge.cc
index 96edb62..c9db173c 100644
--- a/sync/internal_api/http_bridge.cc
+++ b/sync/internal_api/http_bridge.cc
@@ -56,7 +56,7 @@ HttpBridge::RequestContextGetter::GetNetworkTaskRunner() const {
 }
 
 HttpBridgeFactory::HttpBridgeFactory(
-    net::URLRequestContextGetter* baseline_context_getter,
+    const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
     const NetworkTimeUpdateCallback& network_time_update_callback,
     CancelationSignal* cancelation_signal)
     : baseline_request_context_getter_(baseline_context_getter),
diff --git a/sync/internal_api/http_bridge_network_resources.cc b/sync/internal_api/http_bridge_network_resources.cc
index 72716bd..35a1e9b 100644
--- a/sync/internal_api/http_bridge_network_resources.cc
+++ b/sync/internal_api/http_bridge_network_resources.cc
@@ -16,10 +16,10 @@ namespace syncer {
 HttpBridgeNetworkResources::~HttpBridgeNetworkResources() {}
 
 scoped_ptr<HttpPostProviderFactory>
-    HttpBridgeNetworkResources::GetHttpPostProviderFactory(
-        net::URLRequestContextGetter* baseline_context_getter,
-        const NetworkTimeUpdateCallback& network_time_update_callback,
-        CancelationSignal* cancelation_signal) {
+HttpBridgeNetworkResources::GetHttpPostProviderFactory(
+    const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
+    const NetworkTimeUpdateCallback& network_time_update_callback,
+    CancelationSignal* cancelation_signal) {
   return make_scoped_ptr<HttpPostProviderFactory>(
       new HttpBridgeFactory(baseline_context_getter,
                             network_time_update_callback,
diff --git a/sync/internal_api/public/http_bridge.h b/sync/internal_api/public/http_bridge.h
index 3988c7c..02dc981 100644
--- a/sync/internal_api/public/http_bridge.h
+++ b/sync/internal_api/public/http_bridge.h
@@ -228,7 +228,8 @@ class SYNC_EXPORT HttpBridgeFactory : public HttpPostProviderFactory,
                                       public CancelationObserver {
  public:
   HttpBridgeFactory(
-      net::URLRequestContextGetter* baseline_context_getter,
+      const scoped_refptr<net::URLRequestContextGetter>&
+          baseline_context_getter,
       const NetworkTimeUpdateCallback& network_time_update_callback,
       CancelationSignal* cancelation_signal);
   virtual ~HttpBridgeFactory();
diff --git a/sync/internal_api/public/http_bridge_network_resources.h b/sync/internal_api/public/http_bridge_network_resources.h
index 06d8284..2b707ba 100644
--- a/sync/internal_api/public/http_bridge_network_resources.h
+++ b/sync/internal_api/public/http_bridge_network_resources.h
@@ -25,7 +25,8 @@ class SYNC_EXPORT HttpBridgeNetworkResources : public NetworkResources {
 
    // NetworkResources
    virtual scoped_ptr<HttpPostProviderFactory> GetHttpPostProviderFactory(
-       net::URLRequestContextGetter* baseline_context_getter,
+       const scoped_refptr<net::URLRequestContextGetter>&
+           baseline_context_getter,
        const NetworkTimeUpdateCallback& network_time_update_callback,
        CancelationSignal* cancelation_signal) OVERRIDE;
 };
diff --git a/sync/internal_api/public/network_resources.h b/sync/internal_api/public/network_resources.h
index 448188c..575b0b8 100644
--- a/sync/internal_api/public/network_resources.h
+++ b/sync/internal_api/public/network_resources.h
@@ -23,7 +23,8 @@ class SYNC_EXPORT NetworkResources {
   virtual ~NetworkResources() {}
 
   virtual scoped_ptr<HttpPostProviderFactory> GetHttpPostProviderFactory(
-      net::URLRequestContextGetter* baseline_context_getter,
+      const scoped_refptr<net::URLRequestContextGetter>&
+          baseline_context_getter,
       const NetworkTimeUpdateCallback& network_time_update_callback,
       CancelationSignal* cancelation_signal) = 0;
 };
diff --git a/sync/test/fake_server/fake_server_network_resources.cc b/sync/test/fake_server/fake_server_network_resources.cc
index c3bedb0..4750230 100644
--- a/sync/test/fake_server/fake_server_network_resources.cc
+++ b/sync/test/fake_server/fake_server_network_resources.cc
@@ -24,10 +24,10 @@ FakeServerNetworkResources::FakeServerNetworkResources(FakeServer* fake_server)
 FakeServerNetworkResources::~FakeServerNetworkResources() {}
 
 scoped_ptr<syncer::HttpPostProviderFactory>
-    FakeServerNetworkResources::GetHttpPostProviderFactory(
-        net::URLRequestContextGetter* baseline_context_getter,
-        const NetworkTimeUpdateCallback& network_time_update_callback,
-        CancelationSignal* cancelation_signal) {
+FakeServerNetworkResources::GetHttpPostProviderFactory(
+    const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
+    const NetworkTimeUpdateCallback& network_time_update_callback,
+    CancelationSignal* cancelation_signal) {
   return make_scoped_ptr<syncer::HttpPostProviderFactory>(
       new FakeServerHttpPostProviderFactory(
           fake_server_,
diff --git a/sync/test/fake_server/fake_server_network_resources.h b/sync/test/fake_server/fake_server_network_resources.h
index ee2d7c2..8cfe4dc 100644
--- a/sync/test/fake_server/fake_server_network_resources.h
+++ b/sync/test/fake_server/fake_server_network_resources.h
@@ -24,11 +24,12 @@ class FakeServerNetworkResources : public syncer::NetworkResources {
   virtual ~FakeServerNetworkResources();
 
   // NetworkResources
-  virtual
-  scoped_ptr<syncer::HttpPostProviderFactory> GetHttpPostProviderFactory(
-      net::URLRequestContextGetter* baseline_context_getter,
-      const syncer::NetworkTimeUpdateCallback& network_time_update_callback,
-      syncer::CancelationSignal* cancelation_signal) OVERRIDE;
+  virtual scoped_ptr<syncer::HttpPostProviderFactory>
+      GetHttpPostProviderFactory(
+          const scoped_refptr<net::URLRequestContextGetter>&
+              baseline_context_getter,
+          const syncer::NetworkTimeUpdateCallback& network_time_update_callback,
+          syncer::CancelationSignal* cancelation_signal) OVERRIDE;
 
  private:
   FakeServer* const fake_server_;