Replace scoped_ptr with std::unique_ptr in //ui

ui/views/controls/native/native_view_host_unittest.cc

 // Copyright (c) 2012 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/native/native_view_host.h"
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/views/controls/native/native_view_host_test_base.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 class NativeViewHostTest : public test::NativeViewHostTestBase {
  public:
   NativeViewHostTest() {
@@ skipping 72 matching lines @@
 };
 
 }  // namespace
 
 // Verifies NativeViewHierarchyChanged is sent.
 TEST_F(NativeViewHostTest, NativeViewHierarchyChanged) {
   // Create a child widget.
   NativeViewHierarchyChangedTestView* test_view =
       new NativeViewHierarchyChangedTestView;
   NativeViewHost* host = new NativeViewHost;
-  scoped_ptr<Widget> child(CreateChildForHost(toplevel()->GetNativeView(),
-                                              toplevel()->GetRootView(),
-                                              test_view,
-                                              host));
+  std::unique_ptr<Widget> child(CreateChildForHost(
+      toplevel()->GetNativeView(), toplevel()->GetRootView(), test_view, host));
 #if defined(USE_AURA)
   // Two notifications are generated from inserting the native view into the
   // clipping window and then inserting the clipping window into the root
   // window.
   EXPECT_EQ(2, test_view->notification_count());
 #else
   EXPECT_EQ(0, test_view->notification_count());
 #endif
   test_view->ResetCount();
 
@@ skipping 37 matching lines @@
   // +-- host0 (NativeViewHost)
   //     +-- child0 (Widget, attached to host0)
   //     +-- test_host (ViewHierarchyChangedTestHost)
   //         +-- test_child (Widget, attached to test_host)
   // +-- host1 (NativeViewHost)
   //     +-- child1 (Widget, attached to host1)
 
   // Add two children widgets attached to a NativeViewHost, and a test
   // grandchild as child widget of host0.
   NativeViewHost* host0 = new NativeViewHost;
-  scoped_ptr<Widget> child0(CreateChildForHost(toplevel()->GetNativeView(),
-                                               toplevel()->GetRootView(),
-                                               new View,
-                                               host0));
+  std::unique_ptr<Widget> child0(CreateChildForHost(
+      toplevel()->GetNativeView(), toplevel()->GetRootView(), new View, host0));
   NativeViewHost* host1 = new NativeViewHost;
-  scoped_ptr<Widget> child1(CreateChildForHost(toplevel()->GetNativeView(),
-                                               toplevel()->GetRootView(),
-                                               new View,
-                                               host1));
+  std::unique_ptr<Widget> child1(CreateChildForHost(
+      toplevel()->GetNativeView(), toplevel()->GetRootView(), new View, host1));
   ViewHierarchyChangedTestHost* test_host = new ViewHierarchyChangedTestHost;
-  scoped_ptr<Widget> test_child(CreateChildForHost(host0->native_view(),
-                                                   host0,
-                                                   new View,
-                                                   test_host));
+  std::unique_ptr<Widget> test_child(
+      CreateChildForHost(host0->native_view(), host0, new View, test_host));
 
   // Remove test_host from host0, expect 1 parent change.
   test_host->ResetParentChanges();
   EXPECT_EQ(0, test_host->num_parent_changes());
   host0->RemoveChildView(test_host);
   EXPECT_EQ(1, test_host->num_parent_changes());
 
   // Add test_host back to host0, expect 1 parent change.
   test_host->ResetParentChanges();
   EXPECT_EQ(0, test_host->num_parent_changes());
@@ skipping 31 matching lines @@
   //         +-- child1 (Widget, attached to host1)
 
   // Add two children views.
   View* view0 = new View;
   toplevel()->GetRootView()->AddChildView(view0);
   View* view1 = new View;
   toplevel()->GetRootView()->AddChildView(view1);
 
   // To each child view, add a child widget.
   ViewHierarchyChangedTestHost* host0 = new ViewHierarchyChangedTestHost;
-  scoped_ptr<Widget> child0(CreateChildForHost(toplevel()->GetNativeView(),
-                                               view0,
-                                               new View,
-                                               host0));
+  std::unique_ptr<Widget> child0(
+      CreateChildForHost(toplevel()->GetNativeView(), view0, new View, host0));
   ViewHierarchyChangedTestHost* host1 = new ViewHierarchyChangedTestHost;
-  scoped_ptr<Widget> child1(CreateChildForHost(toplevel()->GetNativeView(),
-                                               view1,
-                                               new View,
-                                               host1));
+  std::unique_ptr<Widget> child1(
+      CreateChildForHost(toplevel()->GetNativeView(), view1, new View, host1));
 
   // Remove view0 from top level, expect 1 parent change.
   host0->ResetParentChanges();
   EXPECT_EQ(0, host0->num_parent_changes());
   toplevel()->GetRootView()->RemoveChildView(view0);
   EXPECT_EQ(1, host0->num_parent_changes());
 
   // Add view0 back to top level, expect 1 parent change.
   host0->ResetParentChanges();
   EXPECT_EQ(0, host0->num_parent_changes());
@@ skipping 18 matching lines @@
   host0->ResetParentChanges();
   host1->ResetParentChanges();
   EXPECT_EQ(0, host0->num_parent_changes());
   EXPECT_EQ(0, host1->num_parent_changes());
   child0->GetContentsView()->AddChildView(view1);
   EXPECT_EQ(0, host0->num_parent_changes());
   EXPECT_EQ(2, host1->num_parent_changes());
 }
 
 }  // namespace views