Replace scoped_ptr with std::unique_ptr in //ui

ui/views/controls/webview/webview_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/webview/webview.h"
 
 #include <stdint.h>
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 #include "content/test/test_content_browser_client.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/test/test_views_delegate.h"
@@ skipping 110 matching lines @@
   WebViewUnitTest()
       : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()),
         file_blocking_thread_(content::BrowserThread::FILE_USER_BLOCKING,
                               base::MessageLoop::current()),
         io_thread_(content::BrowserThread::IO, base::MessageLoop::current()),
         top_level_widget_(nullptr) {}
 
   ~WebViewUnitTest() override {}
 
   void SetUp() override {
-    set_views_delegate(make_scoped_ptr(new WebViewTestViewsDelegate));
+    set_views_delegate(base::WrapUnique(new WebViewTestViewsDelegate));
     browser_context_.reset(new content::TestBrowserContext);
     WidgetTest::SetUp();
     // Set the test content browser client to avoid pulling in needless
     // dependencies from content.
     SetBrowserClientForTesting(&test_browser_client_);
 
     // Create a top level widget and add a child, and give it a WebView as a
     // child.
     top_level_widget_ = CreateTopLevelFramelessPlatformWidget();
     top_level_widget_->SetBounds(gfx::Rect(0, 10, 100, 100));
@@ skipping 15 matching lines @@
     // upset ASAN and Valgrind.
     RunPendingMessages();
     WidgetTest::TearDown();
   }
 
  protected:
   Widget* top_level_widget() const { return top_level_widget_; }
   WebView* web_view() const { return web_view_; }
   NativeViewHost* holder() const { return web_view_->holder_; }
 
-  scoped_ptr<content::WebContents> CreateWebContents() const {
-    return make_scoped_ptr(content::WebContents::Create(
+  std::unique_ptr<content::WebContents> CreateWebContents() const {
+    return base::WrapUnique(content::WebContents::Create(
         content::WebContents::CreateParams(browser_context_.get())));
   }
 
  private:
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_blocking_thread_;
   content::TestBrowserThread io_thread_;
-  scoped_ptr<content::TestBrowserContext> browser_context_;
+  std::unique_ptr<content::TestBrowserContext> browser_context_;
   content::TestContentBrowserClient test_browser_client_;
 
   Widget* top_level_widget_;
   WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewUnitTest);
 };
 
 // Tests that attaching and detaching a WebContents to a WebView makes the
 // WebContents visible and hidden respectively.
 TEST_F(WebViewUnitTest, TestWebViewAttachDetachWebContents) {
   // Case 1: Create a new WebContents and set it in the webview via
   // SetWebContents. This should make the WebContents visible.
-  const scoped_ptr<content::WebContents> web_contents1(CreateWebContents());
+  const std::unique_ptr<content::WebContents> web_contents1(
+      CreateWebContents());
   WebViewTestWebContentsObserver observer1(web_contents1.get());
   EXPECT_FALSE(observer1.was_shown());
 
   web_view()->SetWebContents(web_contents1.get());
   EXPECT_TRUE(observer1.was_shown());
 #if defined(USE_AURA)
   EXPECT_TRUE(web_contents1->GetNativeView()->IsVisible());
 #endif
   EXPECT_EQ(observer1.shown_count(), 1);
   EXPECT_EQ(observer1.hidden_count(), 0);
   EXPECT_TRUE(observer1.valid_root_while_shown());
 
   // Case 2: Create another WebContents and replace the current WebContents
   // via SetWebContents(). This should hide the current WebContents and show
   // the new one.
-  const scoped_ptr<content::WebContents> web_contents2(CreateWebContents());
+  const std::unique_ptr<content::WebContents> web_contents2(
+      CreateWebContents());
   WebViewTestWebContentsObserver observer2(web_contents2.get());
   EXPECT_FALSE(observer2.was_shown());
 
   // Setting the new WebContents should hide the existing one.
   web_view()->SetWebContents(web_contents2.get());
   EXPECT_FALSE(observer1.was_shown());
   EXPECT_TRUE(observer2.was_shown());
   EXPECT_TRUE(observer2.valid_root_while_shown());
 
   // WebContents1 should not get stray show calls when WebContents2 is set.
@@ skipping 54 matching lines @@
   parent2->Close();
 }
 
 // Tests that the layout of the NativeViewHost within WebView behaves as
 // expected when embedding a fullscreen widget during WebContents screen
 // capture.
 TEST_F(WebViewUnitTest, EmbeddedFullscreenDuringScreenCapture_Layout) {
   web_view()->SetEmbedFullscreenWidgetMode(true);
   ASSERT_EQ(1, web_view()->child_count());
 
-  const scoped_ptr<content::WebContents> web_contents(CreateWebContents());
+  const std::unique_ptr<content::WebContents> web_contents(CreateWebContents());
   WebViewTestWebContentsDelegate delegate;
   web_contents->SetDelegate(&delegate);
   web_view()->SetWebContents(web_contents.get());
 
   // Initially, the holder should fill the entire WebView.
   EXPECT_EQ(gfx::Rect(0, 0, 100, 100), holder()->bounds());
 
   // Simulate a transition into fullscreen mode, but without screen capture
   // active on the WebContents, the holder should still fill the entire
   // WebView like before.
@@ skipping 32 matching lines @@
 }
 
 // Tests that a WebView correctly switches between WebContentses when one of
 // them is embedding a fullscreen widget during WebContents screen capture.
 TEST_F(WebViewUnitTest, EmbeddedFullscreenDuringScreenCapture_Switching) {
   web_view()->SetEmbedFullscreenWidgetMode(true);
   ASSERT_EQ(1, web_view()->child_count());
   const gfx::NativeView unset_native_view = holder()->native_view();
 
   // Create two WebContentses to switch between.
-  const scoped_ptr<content::WebContents> web_contents1(CreateWebContents());
+  const std::unique_ptr<content::WebContents> web_contents1(
+      CreateWebContents());
   WebViewTestWebContentsDelegate delegate1;
   web_contents1->SetDelegate(&delegate1);
-  const scoped_ptr<content::WebContents> web_contents2(CreateWebContents());
+  const std::unique_ptr<content::WebContents> web_contents2(
+      CreateWebContents());
   WebViewTestWebContentsDelegate delegate2;
   web_contents2->SetDelegate(&delegate2);
 
   EXPECT_NE(web_contents1->GetNativeView(), holder()->native_view());
   web_view()->SetWebContents(web_contents1.get());
   EXPECT_EQ(web_contents1->GetNativeView(), holder()->native_view());
   EXPECT_EQ(gfx::Rect(0, 0, 100, 100), holder()->bounds());
 
   // Begin screen capture of the WebContents and then enter fullscreen mode.
   // The native view should not have changed, but the layout of its holder will
@@ skipping 36 matching lines @@
   // For this test, add another View that can take focus away from WebView.
   web_view()->SetBoundsRect(gfx::Rect(0, 0, 100, 90));
   views::View* const something_to_focus = new views::View();
   something_to_focus->SetBoundsRect(gfx::Rect(0, 90, 100, 10));
   something_to_focus->SetFocusable(true);
   top_level_widget()->GetContentsView()->AddChildView(something_to_focus);
 
   web_view()->SetEmbedFullscreenWidgetMode(true);
   ASSERT_EQ(1, web_view()->child_count());
 
-  const scoped_ptr<content::WebContents> web_contents(CreateWebContents());
+  const std::unique_ptr<content::WebContents> web_contents(CreateWebContents());
   WebViewTestWebContentsDelegate delegate;
   web_contents->SetDelegate(&delegate);
   web_view()->SetWebContents(web_contents.get());
 
   // Begin screen capture of the WebContents and then enter fullscreen mode.
   // The holder should be centered within WebView and sized to match the capture
   // size.
   const gfx::Size capture_size(64, 48);
   web_contents->IncrementCapturerCount(capture_size);
   delegate.set_is_fullscreened(true);
@@ skipping 54 matching lines @@
 
   // Remove WebView from views hierarchy. NativeView should be detached
   // from Widget.
   contents_view->RemoveChildView(webview.get());
   // Destroy WebView. NativeView should be detached secondary.
   // There should be no crash.
   webview.reset();
 }
 
 }  // namespace views