Get rid of RequestRegistry (part 6): get rid of RequestRegistry.

chrome/browser/google_apis/request_sender.cc

 // Copyright (c) 2012 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/google_apis/request_sender.h"
 
 #include "base/bind.h"
+#include "base/stl_util.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/base_requests.h"
 
 namespace google_apis {
 
 RequestSender::RequestSender(
     Profile* profile,
     net::URLRequestContextGetter* url_request_context_getter,
     const std::vector<std::string>& scopes,
     const std::string& custom_user_agent)
     : profile_(profile),
       auth_service_(new AuthService(url_request_context_getter, scopes)),
-      request_registry_(new RequestRegistry()),
       custom_user_agent_(custom_user_agent),
       weak_ptr_factory_(this) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 RequestSender::~RequestSender() {
   DCHECK(thread_checker_.CalledOnValidThread());
+  STLDeleteContainerPointers(in_flight_requests_.begin(),
+                             in_flight_requests_.end());
 }
 
 void RequestSender::Initialize() {
   DCHECK(thread_checker_.CalledOnValidThread());
   auth_service_->Initialize(profile_);
 }
 
 base::Closure RequestSender::StartRequestWithRetry(
     AuthenticatedRequestInterface* request) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  in_flight_requests_.insert(request);
+
   // TODO(kinaba): Stop relying on weak pointers. Move lifetime management
   // of the requests to request sender.
   base::Closure cancel_closure =
       base::Bind(&RequestSender::CancelRequest,
                  weak_ptr_factory_.GetWeakPtr(),
                  request->GetWeakPtr());
 
   if (!auth_service_->HasAccessToken()) {
     // Fetch OAuth2 access token from the refresh token first.
     auth_service_->StartAuthentication(
@@ skipping 40 matching lines @@
 void RequestSender::CancelRequest(
     const base::WeakPtr<AuthenticatedRequestInterface>& request) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Do nothing if the request is already finished.
   if (!request.get())
     return;
   request->Cancel();
 }
 
+void RequestSender::RequestFinished(AuthenticatedRequestInterface* request) {
+  in_flight_requests_.erase(request);
+  delete request;
+}
+
 }  // namespace google_apis