| Index: sync/internal_api/http_bridge_network_resources.cc
|
| diff --git a/sync/internal_api/http_bridge_network_resources.cc b/sync/internal_api/http_bridge_network_resources.cc
|
| index 35a1e9beb877b17f1da5e695035eda7b6d8fdcc1..83eb91cc1c0ea30cb626b31a168c95e39fbdca95 100644
|
| --- a/sync/internal_api/http_bridge_network_resources.cc
|
| +++ b/sync/internal_api/http_bridge_network_resources.cc
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "sync/internal_api/public/http_bridge_network_resources.h"
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| +#include "base/memory/ptr_util.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "sync/internal_api/public/base/cancelation_signal.h"
|
| #include "sync/internal_api/public/http_bridge.h"
|
| @@ -15,15 +17,14 @@ namespace syncer {
|
|
|
| HttpBridgeNetworkResources::~HttpBridgeNetworkResources() {}
|
|
|
| -scoped_ptr<HttpPostProviderFactory>
|
| +std::unique_ptr<HttpPostProviderFactory>
|
| HttpBridgeNetworkResources::GetHttpPostProviderFactory(
|
| const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
|
| const NetworkTimeUpdateCallback& network_time_update_callback,
|
| CancelationSignal* cancelation_signal) {
|
| - return make_scoped_ptr<HttpPostProviderFactory>(
|
| + return base::WrapUnique<HttpPostProviderFactory>(
|
| new HttpBridgeFactory(baseline_context_getter,
|
| - network_time_update_callback,
|
| - cancelation_signal));
|
| + network_time_update_callback, cancelation_signal));
|
| }
|
|
|
| } // namespace syncer
|
|
|