ios/web/web_state/ui/crw_wk_web_view_web_controller.mm - Issue 1586833002: Convert Pass()→std::move() for iOS build.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert accidental //base change Created 4 years, 11 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:

Index: ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

diff --git a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

index 632cab3fad6572d41db641a262673296aac3dbdc..5cedc12de5b5f2fe4733f156fbe920bd7f2dc233 100644

--- a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

+++ b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

@@ -4,8 +4,10 @@

#import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h"

-#include <stddef.h>

#import <WebKit/WebKit.h>

+#include <stddef.h>

+#include <utility>

#include "base/containers/mru_cache.h"

#include "base/ios/ios_util.h"

@@ -414,7 +416,7 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) {

- (instancetype)initWithWebState:(scoped_ptr<web::WebStateImpl>)webState {

DCHECK(webState);

web::BrowserState* browserState = webState->GetBrowserState();

- self = [super initWithWebState:webState.Pass()];

+ self = [super initWithWebState:std::move(webState)];

if (self) {

_certVerificationController.reset([[CRWCertVerificationController alloc]

initWithBrowserState:browserState]);