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

Side by Side Diff: ios/web/public/test/http_server_util.mm

Issue 2128533002: Convert ScopedVector<T> to std::vector<std::unique_ptr<T>>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « ios/web/public/test/http_server_inttest.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ios/web/public/test/http_server_util.h" 5 #include "ios/web/public/test/http_server_util.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/path_service.h" 8 #include "base/path_service.h"
8 #import "ios/web/public/test/http_server.h" 9 #import "ios/web/public/test/http_server.h"
9 #include "ios/web/public/test/response_providers/file_based_response_provider.h" 10 #include "ios/web/public/test/response_providers/file_based_response_provider.h"
10 #include "ios/web/public/test/response_providers/html_response_provider.h" 11 #include "ios/web/public/test/response_providers/html_response_provider.h"
11 12
12 namespace web { 13 namespace web {
13 namespace test { 14 namespace test {
14 15
15 void SetUpSimpleHttpServer(const std::map<GURL, std::string>& responses) { 16 void SetUpSimpleHttpServer(const std::map<GURL, std::string>& responses) {
16 web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance(); 17 web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance();
17 DCHECK(server.IsRunning()); 18 DCHECK(server.IsRunning());
18 std::unique_ptr<web::ResponseProvider> provider; 19 auto provider = base::MakeUnique<HtmlResponseProvider>(responses);
19 provider.reset(new HtmlResponseProvider(responses));
20 20
21 server.RemoveAllResponseProviders(); 21 server.RemoveAllResponseProviders();
22 server.AddResponseProvider(provider.release()); 22 server.AddResponseProvider(std::move(provider));
23 } 23 }
24 24
25 void SetUpFileBasedHttpServer() { 25 void SetUpFileBasedHttpServer() {
26 web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance(); 26 web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance();
27 DCHECK(server.IsRunning()); 27 DCHECK(server.IsRunning());
28 base::FilePath path; 28 base::FilePath path;
29 PathService::Get(base::DIR_MODULE, &path); 29 PathService::Get(base::DIR_MODULE, &path);
30 std::unique_ptr<web::ResponseProvider> file_provider; 30 auto provider = base::MakeUnique<FileBasedResponseProvider>(path);
31 file_provider.reset(new FileBasedResponseProvider(path));
32 DCHECK(file_provider);
33 31
34 server.RemoveAllResponseProviders(); 32 server.RemoveAllResponseProviders();
35 server.AddResponseProvider(file_provider.release()); 33 server.AddResponseProvider(std::move(provider));
36 } 34 }
37 35
38 } // namespace test 36 } // namespace test
39 } // namespace web 37 } // namespace web
OLDNEW
« no previous file with comments | « ios/web/public/test/http_server_inttest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698