| Index: sync/test/fake_server/fake_server_network_resources.cc
|
| diff --git a/sync/test/fake_server/fake_server_network_resources.cc b/sync/test/fake_server/fake_server_network_resources.cc
|
| index b6b573db3c494df95e9b6a9a9d16cb1b9e427e47..7a63485a36e4b21423b83d9d5b1121bc9cf7cf41 100644
|
| --- a/sync/test/fake_server/fake_server_network_resources.cc
|
| +++ b/sync/test/fake_server/fake_server_network_resources.cc
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "sync/test/fake_server/fake_server_network_resources.h"
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "sync/internal_api/public/base/cancelation_signal.h"
|
| @@ -25,15 +27,14 @@ FakeServerNetworkResources::FakeServerNetworkResources(
|
|
|
| FakeServerNetworkResources::~FakeServerNetworkResources() {}
|
|
|
| -scoped_ptr<syncer::HttpPostProviderFactory>
|
| +std::unique_ptr<syncer::HttpPostProviderFactory>
|
| 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>(
|
| + return base::WrapUnique<syncer::HttpPostProviderFactory>(
|
| new FakeServerHttpPostProviderFactory(
|
| - fake_server_,
|
| - base::MessageLoop::current()->task_runner()));
|
| + fake_server_, base::MessageLoop::current()->task_runner()));
|
| }
|
|
|
| } // namespace fake_server
|
|
|