Convert ScopedVector<T> to std::vector<std::unique_ptr<T>>.

ios/web/public/test/http_server.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 IOS_WEB_PUBLIC_TEST_HTTP_SERVER_H_
 #define IOS_WEB_PUBLIC_TEST_HTTP_SERVER_H_
 
 #include <memory>
 #include <vector>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "base/synchronization/lock.h"
 #include "ios/web/public/test/response_providers/response_provider.h"
 
 @class GCDWebServer;
 
 namespace web {
 namespace test {
 
 // A convience class for wrapping a ResponseProvider so that it can be used
 // inside data structures that operate on ref counted objects. This class is a
 // ref counted container for a ResponseProvider.
 // This object exists for legacy reasons since a large part of the code base
 // still uses ResponseProviders that are not ref counted.
 class RefCountedResponseProviderWrapper :
    public base::RefCounted<RefCountedResponseProviderWrapper> {
  public:
   // Main constructor.
   explicit RefCountedResponseProviderWrapper(
-      ResponseProvider* response_provider);
+      std::unique_ptr<ResponseProvider> response_provider);
   // Returns the ResponseProvider that backs this object.
   ResponseProvider* GetResponseProvider() { return response_provider_.get(); }
  private:
   friend class base::RefCounted<RefCountedResponseProviderWrapper>;
   // The ResponseProvider that backs this object.
   std::unique_ptr<ResponseProvider> response_provider_;
   virtual ~RefCountedResponseProviderWrapper();
 };
 
 // The HttpServer is an in-process web server that is used to service requests.
 // It is a singleton and backed by a GCDWebServer.
 // HttpServer can be configured to serve requests by registering
 // web::ResponseProviders.
 // This class is not thread safe on the whole and only certain methods are
 // thread safe.
 class HttpServer {
  public:
-  typedef ScopedVector<ResponseProvider> ProviderList;
+  typedef std::vector<std::unique_ptr<ResponseProvider>> ProviderList;
 
   // Returns the shared HttpServer instance. Thread safe.
   static HttpServer& GetSharedInstance();
   // Returns the shared HttpServer instance and registers the response providers
   // as well. Takes ownership of the response providers. Must be called from the
   // main thread.
   static HttpServer& GetSharedInstanceWithResponseProviders(
-      const ProviderList& response_providers);
+      ProviderList response_providers);
 
   // A convenience method for the longer form of
   // |web::test::HttpServer::GetSharedInstance().MakeUrlForHttpServer|
   static GURL MakeUrl(const std::string& url);
 
   // Starts the server on the default port 8080. CHECKs if the server can not be
   // started.
   // Must be called from the main thread.
   void StartOrDie();
   // Starts the server on |port|. Returns true on success, false otherwise.
   // Must be called from the main thread.
   bool StartOnPort(NSUInteger port);
   // Stops the server and prevents it from accepting new requests.
   // Must be called from the main thread.
   void Stop();
   // Returns true if the server is running.
   // Must be called from the main thread.
   bool IsRunning() const;
 
   // Adds a ResponseProvider. Takes ownership of the ResponseProvider.
   // Note for using URLs inside of the |response_provider|:
   // The HttpServer cannot run on default HTTP port 80, so URLs used in
   // ResponseProviders must be converted at runtime after the HttpServer's port
   // is determined. Please use |MakeUrl| to handle converting URLs.
   // Must be called from the main thread.
-  void AddResponseProvider(ResponseProvider* response_provider);
+  void AddResponseProvider(std::unique_ptr<ResponseProvider> response_provider);
   // Removes the |response_provider|. Must be called from the main thread.
   void RemoveResponseProvider(ResponseProvider* response_provider);
   // Removes all the response providers. Must be called from the main thread.
   void RemoveAllResponseProviders();
 
  private:
   // Initializes the server by registering for a GCDWebServer servlet. Must be
   // called from the main thread.
   void InitHttpServer();
   HttpServer();
@@ skipping 29 matching lines @@
   // The list of providers to service a request.
   std::vector<scoped_refptr<RefCountedResponseProviderWrapper>> providers_;
   DISALLOW_COPY_AND_ASSIGN(HttpServer);
 };
 
 }  // namespace test
 }  // namspace web
 
 #endif  // IOS_WEB_PUBLIC_TEST_HTTP_SERVER_H_