Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Side by Side Diff: sync/test/fake_server/fake_server_network_resources.cc

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/test/fake_server/fake_server_network_resources.h" 5 #include "sync/test/fake_server/fake_server_network_resources.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include <memory>
8
9 #include "base/memory/ptr_util.h"
8 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
9 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
10 #include "sync/internal_api/public/base/cancelation_signal.h" 12 #include "sync/internal_api/public/base/cancelation_signal.h"
11 #include "sync/internal_api/public/http_post_provider_factory.h" 13 #include "sync/internal_api/public/http_post_provider_factory.h"
12 #include "sync/internal_api/public/network_time_update_callback.h" 14 #include "sync/internal_api/public/network_time_update_callback.h"
13 #include "sync/test/fake_server/fake_server.h" 15 #include "sync/test/fake_server/fake_server.h"
14 #include "sync/test/fake_server/fake_server_http_post_provider.h" 16 #include "sync/test/fake_server/fake_server_http_post_provider.h"
15 17
16 using syncer::CancelationSignal; 18 using syncer::CancelationSignal;
17 using syncer::HttpPostProviderFactory; 19 using syncer::HttpPostProviderFactory;
18 using syncer::NetworkTimeUpdateCallback; 20 using syncer::NetworkTimeUpdateCallback;
19 21
20 namespace fake_server { 22 namespace fake_server {
21 23
22 FakeServerNetworkResources::FakeServerNetworkResources( 24 FakeServerNetworkResources::FakeServerNetworkResources(
23 const base::WeakPtr<FakeServer>& fake_server) 25 const base::WeakPtr<FakeServer>& fake_server)
24 : fake_server_(fake_server) { } 26 : fake_server_(fake_server) { }
25 27
26 FakeServerNetworkResources::~FakeServerNetworkResources() {} 28 FakeServerNetworkResources::~FakeServerNetworkResources() {}
27 29
28 scoped_ptr<syncer::HttpPostProviderFactory> 30 std::unique_ptr<syncer::HttpPostProviderFactory>
29 FakeServerNetworkResources::GetHttpPostProviderFactory( 31 FakeServerNetworkResources::GetHttpPostProviderFactory(
30 const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter, 32 const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
31 const NetworkTimeUpdateCallback& network_time_update_callback, 33 const NetworkTimeUpdateCallback& network_time_update_callback,
32 CancelationSignal* cancelation_signal) { 34 CancelationSignal* cancelation_signal) {
33 return make_scoped_ptr<syncer::HttpPostProviderFactory>( 35 return base::WrapUnique<syncer::HttpPostProviderFactory>(
34 new FakeServerHttpPostProviderFactory( 36 new FakeServerHttpPostProviderFactory(
35 fake_server_, 37 fake_server_, base::MessageLoop::current()->task_runner()));
36 base::MessageLoop::current()->task_runner()));
37 } 38 }
38 39
39 } // namespace fake_server 40 } // namespace fake_server
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698