Remove ScopedVector from IDStores

net/ssl/default_channel_id_store.h

 // 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.
 
 #ifndef NET_SSL_DEFAULT_CHANNEL_ID_STORE_H_
 #define NET_SSL_DEFAULT_CHANNEL_ID_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 75 matching lines @@
       }
       initialized_ = true;
     }
   }
 
   // Initializes the backing store and reads existing certs from it.
   // Should only be called by InitIfNecessary().
   void InitStore();
 
   // Callback for backing store loading completion.
-  void OnLoaded(scoped_ptr<ScopedVector<ChannelID> > certs);
+  void OnLoaded(scoped_ptr<std::vector<scoped_ptr<ChannelID>>> certs);
 
   // Syncronous methods which do the actual work. Can only be called after
   // initialization is complete.
   void SyncSetChannelID(scoped_ptr<ChannelID> channel_id);
   void SyncDeleteChannelID(const std::string& server_identifier);
   void SyncDeleteAllCreatedBetween(base::Time delete_begin,
                                    base::Time delete_end);
   void SyncGetAllChannelIDs(ChannelIDList* channel_id_list);
 
   // Add |task| to |waiting_tasks_|.
@@ skipping 13 matching lines @@
 
   // Indicates whether the channel id store has been initialized. This happens
   // lazily in InitIfNecessary().
   bool initialized_;
 
   // Indicates whether loading from the backend store is completed and
   // calls may be immediately processed.
   bool loaded_;
 
   // Tasks that are waiting to be run once we finish loading.
-  ScopedVector<Task> waiting_tasks_;
+  std::vector<scoped_ptr<Task>> waiting_tasks_;
   base::TimeTicks waiting_tasks_start_time_;
 
   scoped_refptr<PersistentStore> store_;
 
   ChannelIDMap channel_ids_;
 
   base::WeakPtrFactory<DefaultChannelIDStore> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultChannelIDStore);
 };
 
 typedef base::RefCountedThreadSafe<DefaultChannelIDStore::PersistentStore>
     RefcountedPersistentStore;
 
 class NET_EXPORT DefaultChannelIDStore::PersistentStore
     : public RefcountedPersistentStore {
  public:
-  typedef base::Callback<void(scoped_ptr<ScopedVector<ChannelID> >)>
+  typedef base::Callback<void(scoped_ptr<std::vector<scoped_ptr<ChannelID>>>)>
       LoadedCallback;
 
   // Initializes the store and retrieves the existing channel_ids. This will be
   // called only once at startup. Note that the channel_ids are individually
   // allocated and that ownership is transferred to the caller upon return.
   // The |loaded_callback| must not be called synchronously.
   virtual void Load(const LoadedCallback& loaded_callback) = 0;
 
   virtual void AddChannelID(const ChannelID& channel_id) = 0;
 
   virtual void DeleteChannelID(const ChannelID& channel_id) = 0;
 
   // When invoked, instructs the store to keep session related data on
   // destruction.
   virtual void SetForceKeepSessionState() = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<PersistentStore>;
 
   PersistentStore();
   virtual ~PersistentStore();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PersistentStore);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_DEFAULT_CHANNEL_ID_STORE_H_