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

Unified Diff: ios/web/test/web_test.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
« no previous file with comments | « ios/web/shell/view_controller.mm ('k') | ios/web/web_state/crw_pass_kit_downloader.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/test/web_test.mm
diff --git a/ios/web/test/web_test.mm b/ios/web/test/web_test.mm
index fb43ada7a64c437d2fad34551de84fc3dfe42f49..0ef56ead87f3de65f5fc465aeb84f21665bb19a3 100644
--- a/ios/web/test/web_test.mm
+++ b/ios/web/test/web_test.mm
@@ -7,6 +7,7 @@
#include <utility>
#include "base/base64.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#import "base/test/ios/wait_util.h"
#import "ios/testing/ocmock_complex_type_helper.h"
@@ -36,7 +37,7 @@ namespace web {
#pragma mark -
-WebTest::WebTest() : web_client_(make_scoped_ptr(new TestWebClient)) {}
+WebTest::WebTest() : web_client_(base::WrapUnique(new TestWebClient)) {}
WebTest::~WebTest() {}
void WebTest::SetUp() {
@@ -219,7 +220,8 @@ NSString* WebTestWithWebController::RunJavaScript(NSString* script) {
}
CRWWebController* WebTestWithWebController::CreateWebController() {
- scoped_ptr<WebStateImpl> web_state_impl(new WebStateImpl(GetBrowserState()));
+ std::unique_ptr<WebStateImpl> web_state_impl(
+ new WebStateImpl(GetBrowserState()));
return [[CRWWKWebViewWebController alloc]
initWithWebState:std::move(web_state_impl)];
}
« no previous file with comments | « ios/web/shell/view_controller.mm ('k') | ios/web/web_state/crw_pass_kit_downloader.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698