| Index: ui/views/controls/webview/webview.cc
|
| diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc
|
| index 686eeb6ddd4a4d78541e966cca8f3ce20e861b81..dee63428831a06b0867e9c459a18fbe659804a1b 100644
|
| --- a/ui/views/controls/webview/webview.cc
|
| +++ b/ui/views/controls/webview/webview.cc
|
| @@ -112,11 +112,11 @@ const char* WebView::GetClassName() const {
|
| return kViewClassName;
|
| }
|
|
|
| -scoped_ptr<content::WebContents> WebView::SwapWebContents(
|
| - scoped_ptr<content::WebContents> new_web_contents) {
|
| +std::unique_ptr<content::WebContents> WebView::SwapWebContents(
|
| + std::unique_ptr<content::WebContents> new_web_contents) {
|
| if (wc_owner_)
|
| wc_owner_->SetDelegate(NULL);
|
| - scoped_ptr<content::WebContents> old_web_contents(std::move(wc_owner_));
|
| + std::unique_ptr<content::WebContents> old_web_contents(std::move(wc_owner_));
|
| wc_owner_ = std::move(new_web_contents);
|
| if (wc_owner_)
|
| wc_owner_->SetDelegate(this);
|
|
|