Remove ScopedVector from chrome/browser/.

chrome/browser/apps/drive/drive_app_provider.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 "chrome/browser/apps/drive/drive_app_provider.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/apps/drive/drive_app_converter.h"
 #include "chrome/browser/apps/drive/drive_app_mapping.h"
 #include "chrome/browser/apps/drive/drive_app_uninstall_sync_service.h"
 #include "chrome/browser/apps/drive/drive_service_bridge.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
@@ skipping 116 matching lines @@
 void DriveAppProvider::SchedulePendingConverters() {
   if (pending_converters_.empty())
     return;
 
   if (!pending_converters_.front()->IsStarted())
     pending_converters_.front()->Start();
 }
 
 void DriveAppProvider::OnLocalAppConverted(const DriveAppConverter* converter,
                                            bool success) {
-  DCHECK_EQ(pending_converters_.front(), converter);
+  DCHECK_EQ(pending_converters_.front().get(), converter);
 
   if (success) {
     const bool was_generated =
         mapping_->GetDriveApp(converter->extension()->id()) ==
             converter->drive_app_info().app_id &&
         mapping_->IsChromeAppGenerated(converter->extension()->id());
     UpdateMappingAndExtensionSystem(
         converter->drive_app_info().app_id,
         converter->extension(),
         converter->is_new_install() || was_generated);
@@ skipping 30 matching lines @@
       ExtensionRegistry::Get(profile_)->GetExtensionById(
           drive_app.product_id, ExtensionRegistry::EVERYTHING);
   if (chrome_app) {
     UpdateMappingAndExtensionSystem(drive_app.app_id, chrome_app, false);
     return;
   }
 
   if (IsMappedUrlAppUpToDate(drive_app))
     return;
 
-  ScopedVector<DriveAppConverter>::iterator it = pending_converters_.begin();
+  auto it = pending_converters_.begin();
   while (it != pending_converters_.end()) {
     if (!(*it)->IsStarted() &&
         (*it)->drive_app_info().app_id == drive_app.app_id) {
       it = pending_converters_.erase(it);
     } else {
       ++it;
     }
   }
 
-  pending_converters_.push_back(
-      new DriveAppConverter(profile_,
-                            drive_app,
-                            base::Bind(&DriveAppProvider::OnLocalAppConverted,
-                                       base::Unretained(this))));
+  pending_converters_.push_back(base::MakeUnique<DriveAppConverter>(
+      profile_, drive_app,
+      base::Bind(&DriveAppProvider::OnLocalAppConverted,
+                 base::Unretained(this))));
 }
 
 void DriveAppProvider::ProcessRemovedDriveApp(const std::string& drive_app_id) {
   const std::string chrome_app_id = mapping_->GetChromeApp(drive_app_id);
   const bool is_generated = mapping_->IsChromeAppGenerated(chrome_app_id);
   mapping_->Remove(drive_app_id);
 
   if (chrome_app_id.empty() || !is_generated)
     return;
 
@@ skipping 100 matching lines @@
       service_bridge_->GetAppRegistry()->UninstallApp(
           drive_app_id, base::Bind(&IgnoreUninstallResult));
     } else {
       mapping_->AddUninstalledDriveApp(drive_app_id);
       uninstall_sync_service_->TrackUninstalledDriveApp(drive_app_id);
     }
 
     return;
   }
 }