Wait for pending requests to finish in ImageDecoder.

chrome/browser/image_decoder.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/image_decoder.h"
 
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_utility_messages.h"
@@ skipping 156 matching lines @@
   utility_process_host_->SetName(l10n_util::GetStringUTF16(
       IDS_UTILITY_PROCESS_IMAGE_DECODER_NAME));
   if (!utility_process_host_->StartBatchMode()) {
      utility_process_host_.reset();
      return;
   }
 }
 
 void ImageDecoder::StopBatchMode() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  {
+    // Check for outstanding requests and wait for them to finish.
+    base::AutoLock lock(map_lock_);
+    if (!image_request_id_map_.empty()) {
+      batch_mode_timer_->Reset();
+      return;
+    }
+  }
+
   if (utility_process_host_) {
     utility_process_host_->EndBatchMode();
     utility_process_host_.reset();
   }
-
-  // There could be outstanding request that are taking too long. Fail these so
-  // that there aren't any dangling requests.
-  FailAllRequests();
 }
 
 void ImageDecoder::FailAllRequests() {
   RequestMap requests;
   {
     base::AutoLock lock(map_lock_);
     requests = image_request_id_map_;
   }
 
   // Since |OnProcessCrashed| and |OnProcessLaunchFailed| are run asynchronously
@@ skipping 83 matching lines @@
     auto it = image_request_id_map_.find(request_id);
     if (it == image_request_id_map_.end())
       return;
     image_request = it->second;
     image_request_id_map_.erase(it);
   }
 
   DCHECK(image_request->task_runner()->RunsTasksOnCurrentThread());
   image_request->OnDecodeImageFailed();
 }