Remove ScopedVector from chrome/browser/.

chrome/browser/apps/drive/drive_app_converter.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_converter.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/image_decoder.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "net/base/load_flags.h"
@@ skipping 121 matching lines @@
   web_app_.app_url = drive_app_info_.create_url;
 
   std::set<int> pending_sizes;
   for (size_t i = 0; i < drive_app_info_.app_icons.size(); ++i) {
     const int icon_size = drive_app_info_.app_icons[i].first;
     if (pending_sizes.find(icon_size) != pending_sizes.end())
       continue;
 
     pending_sizes.insert(icon_size);
     const GURL& icon_url = drive_app_info_.app_icons[i].second;
-    IconFetcher* fetcher = new IconFetcher(this, icon_url, icon_size);
-    fetchers_.push_back(fetcher);  // Pass ownership to |fetchers|.
-    fetcher->Start();
+    fetchers_.push_back(
+        base::MakeUnique<IconFetcher>(this, icon_url, icon_size));
+    fetchers_.back()->Start();
   }
 
   if (fetchers_.empty())
     StartInstall();
 }
 
 bool DriveAppConverter::IsStarted() const {
   return !fetchers_.empty() || crx_installer_.get();
 }
 
 bool DriveAppConverter::IsInstalling(const std::string& app_id) const {
   return crx_installer_.get() && crx_installer_->extension() &&
          crx_installer_->extension()->id() == app_id;
 }
 
 void DriveAppConverter::OnIconFetchComplete(const IconFetcher* fetcher) {
   const SkBitmap& icon = fetcher->icon();
   if (!icon.empty() && icon.width() != 0) {
     WebApplicationInfo::IconInfo icon_info;
     icon_info.url = fetcher->icon_url();
     icon_info.data = icon;
     icon_info.width = icon.width();
     icon_info.height = icon.height();
     web_app_.icons.push_back(icon_info);
   }
 
-  fetchers_.erase(std::find(fetchers_.begin(), fetchers_.end(), fetcher));
+  fetchers_.erase(
+      std::find_if(fetchers_.begin(), fetchers_.end(),
+                   [fetcher](const std::unique_ptr<IconFetcher>& item) {
+                     return item.get() == fetcher;
+                   }));
 
   if (fetchers_.empty())
     StartInstall();
 }
 
 void DriveAppConverter::StartInstall() {
   DCHECK(!crx_installer_.get());
   crx_installer_ = extensions::CrxInstaller::CreateSilent(
       extensions::ExtensionSystem::Get(profile_)->extension_service());
   // The converted url app should not be syncable. Drive apps go with the user's
@@ skipping 21 matching lines @@
     return;
   }
 
   extension_ = crx_installer_->extension();
   is_new_install_ = success && !crx_installer_->current_version().IsValid();
   PostInstallCleanUp();
 
   base::ResetAndReturn(&finished_callback_).Run(this, success);
   // |finished_callback_| could delete this.
 }