| Index: storage/browser/fileapi/file_system_context.cc
 | 
| diff --git a/storage/browser/fileapi/file_system_context.cc b/storage/browser/fileapi/file_system_context.cc
 | 
| index 142489523a08d3dd7112aaf8ebb16ac571550400..1de97d456e4f79c4bead71f4facee416109c43c9 100644
 | 
| --- a/storage/browser/fileapi/file_system_context.cc
 | 
| +++ b/storage/browser/fileapi/file_system_context.cc
 | 
| @@ -145,7 +145,7 @@ FileSystemContext::FileSystemContext(
 | 
|      ExternalMountPoints* external_mount_points,
 | 
|      storage::SpecialStoragePolicy* special_storage_policy,
 | 
|      storage::QuotaManagerProxy* quota_manager_proxy,
 | 
| -    ScopedVector<FileSystemBackend> additional_backends,
 | 
| +    std::vector<std::unique_ptr<FileSystemBackend>> additional_backends,
 | 
|      const std::vector<URLRequestAutoMountHandler>& auto_mount_handlers,
 | 
|      const base::FilePath& partition_path,
 | 
|      const FileSystemOptions& options)
 | 
| @@ -173,11 +173,8 @@ FileSystemContext::FileSystemContext(
 | 
|    RegisterBackend(sandbox_backend_.get());
 | 
|    RegisterBackend(plugin_private_backend_.get());
 | 
|  
 | 
| -  for (ScopedVector<FileSystemBackend>::const_iterator iter =
 | 
| -          additional_backends_.begin();
 | 
| -       iter != additional_backends_.end(); ++iter) {
 | 
| -    RegisterBackend(*iter);
 | 
| -  }
 | 
| +  for (const auto& backend : additional_backends_)
 | 
| +    RegisterBackend(backend.get());
 | 
|  
 | 
|    // If the embedder's additional backends already provide support for
 | 
|    // kFileSystemTypeNativeLocal and kFileSystemTypeNativeForPlatformApp then
 | 
| @@ -198,11 +195,8 @@ FileSystemContext::FileSystemContext(
 | 
|    sandbox_backend_->Initialize(this);
 | 
|    isolated_backend_->Initialize(this);
 | 
|    plugin_private_backend_->Initialize(this);
 | 
| -  for (ScopedVector<FileSystemBackend>::const_iterator iter =
 | 
| -          additional_backends_.begin();
 | 
| -       iter != additional_backends_.end(); ++iter) {
 | 
| -    (*iter)->Initialize(this);
 | 
| -  }
 | 
| +  for (const auto& backend : additional_backends_)
 | 
| +    backend->Initialize(this);
 | 
|  
 | 
|    // Additional mount points must be added before regular system-wide
 | 
|    // mount points.
 | 
| 
 |