diff options
| author | dcheng <dcheng@chromium.org> | 2016-01-13 20:41:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 04:43:33 +0000 |
| commit | 5e05b437032ffeb7bf9da7dcf1355fc668a33a9d (patch) | |
| tree | 5ce11c333ab085b2bb85cb8c989225f504c0c293 /ios/web/test | |
| parent | e8ecfb59d4f906e0ab40b6046406b8af1366cb10 (diff) | |
| download | chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.zip chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.tar.gz chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.tar.bz2 | |
Convert Pass()→std::move() for iOS build.
BUG=557422
R=rickyz@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1586833002
Cr-Commit-Position: refs/heads/master@{#369328}
Diffstat (limited to 'ios/web/test')
| -rw-r--r-- | ios/web/test/web_test.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ios/web/test/web_test.mm b/ios/web/test/web_test.mm index cc49404..f6c781c 100644 --- a/ios/web/test/web_test.mm +++ b/ios/web/test/web_test.mm @@ -4,6 +4,8 @@ #import "ios/web/test/web_test.h" +#include <utility> + #include "base/base64.h" #include "base/strings/stringprintf.h" #import "base/test/ios/wait_util.h" @@ -263,7 +265,7 @@ NSString* WebTestWithWebController::CreateLoadCheck() { CRWWebController* WebTestWithUIWebViewWebController::CreateWebController() { scoped_ptr<WebStateImpl> web_state_impl(new WebStateImpl(GetBrowserState())); - return [[TestWebController alloc] initWithWebState:web_state_impl.Pass()]; + return [[TestWebController alloc] initWithWebState:std::move(web_state_impl)]; } void WebTestWithUIWebViewWebController::LoadCommands(NSString* commands, @@ -279,8 +281,8 @@ void WebTestWithUIWebViewWebController::LoadCommands(NSString* commands, CRWWebController* WebTestWithWKWebViewWebController::CreateWebController() { scoped_ptr<WebStateImpl> web_state_impl(new WebStateImpl(GetBrowserState())); - return [[CRWWKWebViewWebController alloc] initWithWebState: - web_state_impl.Pass()]; + return [[CRWWKWebViewWebController alloc] + initWithWebState:std::move(web_state_impl)]; } } // namespace web |