Replace scoped_ptr with std::unique_ptr in //ui

ui/app_list/views/app_list_view_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/app_list/views/app_list_view.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
@@ skipping 127 matching lines @@
   void Close();
 
   // Checks the search box widget is at |expected| in the contents view's
   // coordinate space.
   bool CheckSearchBoxWidget(const gfx::Rect& expected);
 
   // Gets the PaginationModel owned by |view_|.
   PaginationModel* GetPaginationModel();
 
   const TestType test_type_;
-  scoped_ptr<base::RunLoop> run_loop_;
+  std::unique_ptr<base::RunLoop> run_loop_;
   app_list::AppListView* view_;  // Owned by native widget.
-  scoped_ptr<app_list::test::AppListTestViewDelegate> delegate_;
+  std::unique_ptr<app_list::test::AppListTestViewDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListViewTestContext);
 };
 
 // Extend the regular AppListTestViewDelegate to communicate back to the test
 // context. Note the test context doesn't simply inherit this, because the
 // delegate is owned by the view.
 class UnitTestViewDelegate : public app_list::test::AppListTestViewDelegate {
  public:
   explicit UnitTestViewDelegate(AppListViewTestContext* parent)
@@ skipping 374 matching lines @@
 
   Show();
 
   if (is_landscape())
     EXPECT_EQ(2, GetPaginationModel()->total_pages());
   else
     EXPECT_EQ(3, GetPaginationModel()->total_pages());
 
   // Change the profile. The original model needs to be kept alive for
   // observers to unregister themselves.
-  scoped_ptr<AppListTestModel> original_test_model(
+  std::unique_ptr<AppListTestModel> original_test_model(
       delegate_->ReleaseTestModel());
   delegate_->set_next_profile_app_count(1);
 
   // The original ContentsView is destroyed here.
   view_->SetProfileByPath(base::FilePath());
   EXPECT_EQ(1, GetPaginationModel()->total_pages());
 
   StartPageView* start_page_view =
       view_->app_list_main_view()->contents_view()->start_page_view();
   if (test_type_ == EXPERIMENTAL)
@@ skipping 126 matching lines @@
 
     test_context_.reset(new AppListViewTestContext(GetParam(), container));
   }
 
   void TearDown() override {
     test_context_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
-  scoped_ptr<AppListViewTestContext> test_context_;
+  std::unique_ptr<AppListViewTestContext> test_context_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListViewTestAura);
 };
 
 class AppListViewTestDesktop : public views::ViewsTestBase,
                                public ::testing::WithParamInterface<int> {
  public:
   AppListViewTestDesktop() {}
   virtual ~AppListViewTestDesktop() {}
 
   // testing::Test overrides:
   void SetUp() override {
-    set_views_delegate(make_scoped_ptr(new AppListViewTestViewsDelegate(this)));
+    set_views_delegate(
+        base::WrapUnique(new AppListViewTestViewsDelegate(this)));
     views::ViewsTestBase::SetUp();
     test_context_.reset(new AppListViewTestContext(GetParam(), NULL));
   }
 
   void TearDown() override {
     test_context_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
-  scoped_ptr<AppListViewTestContext> test_context_;
+  std::unique_ptr<AppListViewTestContext> test_context_;
 
  private:
   class AppListViewTestViewsDelegate : public views::TestViewsDelegate {
    public:
     explicit AppListViewTestViewsDelegate(AppListViewTestDesktop* parent)
 #if defined(OS_CHROMEOS)
         : parent_(parent)
 #endif
     {
     }
@@ skipping 112 matching lines @@
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 #endif
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list