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

chrome/browser/google_apis/base_requests.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/base_requests.h"
 
 #include "base/json/json_reader.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
@@ skipping 75 matching lines @@
   base::PostTaskAndReplyWithResult(
       BrowserThread::GetBlockingPool(),
       FROM_HERE,
       base::Bind(&ParseJsonOnBlockingPool, json),
       callback);
 }
 
 //============================ UrlFetchRequestBase ===========================
 
 UrlFetchRequestBase::UrlFetchRequestBase(
-    RequestSender* runner,
+    RequestSender* sender,
     net::URLRequestContextGetter* url_request_context_getter)
-    : RequestRegistry::Request(runner->request_registry()),
-      url_request_context_getter_(url_request_context_getter),
+    : url_request_context_getter_(url_request_context_getter),
       re_authenticate_count_(0),
-      started_(false),
+      sender_(sender),
       save_temp_file_(false),
       weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 UrlFetchRequestBase::~UrlFetchRequestBase() {}
 
 void UrlFetchRequestBase::Start(const std::string& access_token,
                                 const std::string& custom_user_agent,
                                 const ReAuthenticateCallback& callback) {
@@ skipping 72 matching lines @@
       if (request_type == URLFetcher::POST ||
           request_type == URLFetcher::PUT ||
           request_type == URLFetcher::PATCH) {
         // Set empty upload content-type and upload content, so that
         // the request will have no "Content-type: " header and no content.
         url_fetcher_->SetUploadData(std::string(), std::string());
       }
     }
   }
 
-  // Register to request registry.
-  NotifyStart();
-
   url_fetcher_->Start();
-  started_ = true;
 }
 
 URLFetcher::RequestType UrlFetchRequestBase::GetRequestType() const {
   return URLFetcher::GET;
 }
 
 std::vector<std::string> UrlFetchRequestBase::GetExtraRequestHeaders() const {
   return std::vector<std::string>();
 }
 
 bool UrlFetchRequestBase::GetContentData(std::string* upload_content_type,
                                          std::string* upload_content) {
   return false;
 }
 
 bool UrlFetchRequestBase::GetContentFile(base::FilePath* local_file_path,
                                          int64* range_offset,
                                          int64* range_length,
                                          std::string* upload_content_type) {
   return false;
 }
 
 void UrlFetchRequestBase::Cancel() {
   url_fetcher_.reset(NULL);
   RunCallbackOnPrematureFailure(GDATA_CANCELLED);
-  NotifyFinish();
+  sender_->RequestFinished(this);
 }
 
 // static
 GDataErrorCode UrlFetchRequestBase::GetErrorCode(const URLFetcher* source) {
   GDataErrorCode code = static_cast<GDataErrorCode>(source->GetResponseCode());
   if (!source->GetStatus().is_success()) {
     switch (source->GetStatus().error()) {
       case net::ERR_NETWORK_CHANGED:
         code = GDATA_NO_CONNECTION;
         break;
       default:
         code = GDATA_OTHER_ERROR;
     }
   }
   return code;
 }
 
 void UrlFetchRequestBase::OnProcessURLFetchResultsComplete(bool result) {
-  NotifyFinish();
+  sender_->RequestFinished(this);
 }
 
 void UrlFetchRequestBase::OnURLFetchComplete(const URLFetcher* source) {
   GDataErrorCode code = GetErrorCode(source);
   DVLOG(1) << "Response headers:\n" << GetResponseHeadersAsString(source);
 
   if (code == HTTP_UNAUTHORIZED) {
     if (++re_authenticate_count_ <= kMaxReAuthenticateAttemptsPerRequest) {
       // Reset re_authenticate_callback_ so Start() can be called again.
       ReAuthenticateCallback callback = re_authenticate_callback_;
       re_authenticate_callback_.Reset();
       callback.Run(this);
       return;
     }
 
     OnAuthFailed(code);
     return;
   }
 
   // Overridden by each specialization
   ProcessURLFetchResults(source);
 }
 
 void UrlFetchRequestBase::OnAuthFailed(GDataErrorCode code) {
   RunCallbackOnPrematureFailure(code);
-
-  // Check if this failed before we even started fetching. If so, register
-  // for start so we can properly unregister with finish.
-  if (!started_)
-    NotifyStart();
-
-  // Note: NotifyFinish() must be invoked at the end, after all other callbacks
-  // and notifications. Once NotifyFinish() is called, the current instance of
-  // request will be deleted from the RequestRegistry and become invalid.
-  NotifyFinish();
+  sender_->RequestFinished(this);
 }
 
 base::WeakPtr<AuthenticatedRequestInterface>
 UrlFetchRequestBase::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 //============================ EntryActionRequest ============================
 
 EntryActionRequest::EntryActionRequest(
@@ skipping 406 matching lines @@
 
   download_action_callback_.Run(code, temp_file);
   OnProcessURLFetchResultsComplete(code == HTTP_SUCCESS);
 }
 
 void DownloadFileRequest::RunCallbackOnPrematureFailure(GDataErrorCode code) {
   download_action_callback_.Run(code, base::FilePath());
 }
 
 }  // namespace google_apis