Convert //ash from scoped_ptr to std::unique_ptr

ash/shell/app_list.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 <string>
 #include <utility>
 #include <vector>
 

[oshima, 2016/04/08 07:09:41]

include?

 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_delegate.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 99 matching lines @@
         Shell::GetInstance()->session_state_delegate()->LockScreen();
         break;
       }
       case WIDGETS_WINDOW: {
         CreateWidgetsWindow();
         break;
       }
       case EXAMPLES_WINDOW: {
         views::examples::ShowExamplesWindow(
             views::examples::QUIT_ON_CLOSE, NULL,
-            scoped_ptr<ScopedVector<views::examples::ExampleBase>>());
+            std::unique_ptr<ScopedVector<views::examples::ExampleBase>>());
         break;
       }
       default:
         break;
     }
   }
 
   // AppListItem
   void Activate(int event_flags) override { ActivateItem(type_, event_flags); }
 
@@ skipping 47 matching lines @@
         base::UTF8ToUTF16(WindowTypeShelfItem::GetDetails(type_));
     set_details(details);
     Tags details_tags;
     details_tags.push_back(Tag(Tag::DIM, 0, details.length()));
     set_details_tags(details_tags);
   }
 
   WindowTypeShelfItem::Type type() const { return type_; }
 
   // app_list::SearchResult:
-  scoped_ptr<SearchResult> Duplicate() const override {
-    return scoped_ptr<SearchResult>();
+  std::unique_ptr<SearchResult> Duplicate() const override {
+    return std::unique_ptr<SearchResult>();
   }
 
  private:
   WindowTypeShelfItem::Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(ExampleSearchResult);
 };
 
 class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
  public:
   ExampleAppListViewDelegate()
       : model_(new app_list::AppListModel) {
     PopulateApps();
     DecorateSearchBox(model_->search_box());
   }
 
  private:
   void PopulateApps() {
     for (int i = 0; i < static_cast<int>(WindowTypeShelfItem::LAST_TYPE); ++i) {
       WindowTypeShelfItem::Type type =
           static_cast<WindowTypeShelfItem::Type>(i);
       std::string id = base::IntToString(i);
-      scoped_ptr<WindowTypeShelfItem> shelf_item(
+      std::unique_ptr<WindowTypeShelfItem> shelf_item(
           new WindowTypeShelfItem(id, type));
       model_->AddItem(std::move(shelf_item));
     }
   }
 
   gfx::ImageSkia CreateSearchBoxIcon() {
     const base::string16 icon_text = base::ASCIIToUTF16("ash");
     const gfx::Size icon_size(32, 32);
 
     gfx::Canvas canvas(icon_size, 1.0f, false /* is_opaque */);
@@ skipping 119 matching lines @@
       const gfx::Size& size) override {
     return std::vector<views::View*>();
   }
 
   void CustomLauncherPageAnimationChanged(double progress) override {}
 
   void CustomLauncherPagePopSubpage() override {}
 
   bool IsSpeechRecognitionEnabled() override { return false; }
 
-  scoped_ptr<app_list::AppListModel> model_;
+  std::unique_ptr<app_list::AppListModel> model_;
   app_list::SpeechUIModel speech_ui_;
   Users users_;
 
   DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
 };
 
 }  // namespace
 
 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
   return new ExampleAppListViewDelegate;
 }
 
 }  // namespace shell
 }  // namespace ash