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

Unified Diff: ios/web/public/test/http_server_inttest.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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 side-by-side diff with in-line comments
Download patch
Index: ios/web/public/test/http_server_inttest.mm
diff --git a/ios/web/public/test/http_server_inttest.mm b/ios/web/public/test/http_server_inttest.mm
index faf7d66a8a4ae1f671ed3ae707424a98cca37a4f..2c81da2a7b006dbd14081c80bc6127ce45bc8ba6 100644
--- a/ios/web/public/test/http_server_inttest.mm
+++ b/ios/web/public/test/http_server_inttest.mm
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "ios/web/public/test/http_server.h"
-
#import <Foundation/Foundation.h>
+
+#include <memory>
#include <string>
#import "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/sys_string_conversions.h"
#import "base/test/ios/wait_util.h"
+#import "ios/web/public/test/http_server.h"
#include "ios/web/public/test/response_providers/string_response_provider.h"
#import "ios/web/test/web_int_test.h"
#import "net/base/mac/url_conversions.h"
@@ -25,7 +25,7 @@ typedef web::WebIntTest HttpServerTest;
// requests and response from |TestResponseProvider|.
TEST_F(HttpServerTest, StartAndInterfaceWithResponseProvider) {
const std::string kHelloWorld = "Hello World";
- scoped_ptr<web::StringResponseProvider> provider(
+ std::unique_ptr<web::StringResponseProvider> provider(
new web::StringResponseProvider(kHelloWorld));
web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance();
« no previous file with comments | « ios/web/public/test/http_server.h ('k') | ios/web/public/test/response_providers/file_based_response_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698