Fix a race condition in BrowsingDataRemover.

chrome/browser/browsing_data/browsing_data_remover.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/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 362 matching lines @@
     const BrowsingDataFilterBuilder& filter_builder) {
   RemoveImpl(time_range, remove_mask, filter_builder, origin_type_mask);
 }
 
 void BrowsingDataRemover::RemoveImpl(
     const TimeRange& time_range,
     int remove_mask,
     const BrowsingDataFilterBuilder& filter_builder,
     int origin_type_mask) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  waiting_for_synchronous_clear_operations_ = true;
 
   // crbug.com/140910: Many places were calling this with base::Time() as
   // delete_end, even though they should've used base::Time::Max().
   DCHECK_NE(base::Time(), time_range.end);
 
   SetRemoving(true);
   delete_begin_ = time_range.begin;
   delete_end_ = time_range.end;
   remove_mask_ = remove_mask;
   origin_type_mask_ = origin_type_mask;
@@ skipping 639 matching lines @@
   CookieOrCacheDeletionChoice choice = NEITHER_COOKIES_NOR_CACHE;
   if (remove_mask & REMOVE_COOKIES &&
       origin_type_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) {
     choice = remove_mask & REMOVE_CACHE ? BOTH_COOKIES_AND_CACHE
                                         : ONLY_COOKIES;
   } else if (remove_mask & REMOVE_CACHE) {
     choice = ONLY_CACHE;
   }
 
   // Notify in case all actions taken were synchronous.
+  waiting_for_synchronous_clear_operations_ = false;
   NotifyIfDone();
 
   UMA_HISTOGRAM_ENUMERATION(
       "History.ClearBrowsingData.UserDeletedCookieOrCache",
       choice, MAX_CHOICE_VALUE);
 }
 
 void BrowsingDataRemover::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
@@ skipping 26 matching lines @@
   for (const ContentSettingPatternSource& setting : settings) {
     if (predicate.Run(setting.primary_pattern, setting.secondary_pattern)) {
       content_settings_map->SetWebsiteSettingCustomScope(
           setting.primary_pattern, setting.secondary_pattern, content_type,
           std::string(), nullptr);
     }
   }
 }
 
 bool BrowsingDataRemover::AllDone() {
-  return !waiting_for_clear_autofill_origin_urls_ &&
+  return !waiting_for_synchronous_clear_operations_ &&
+         !waiting_for_clear_autofill_origin_urls_ &&
          !waiting_for_clear_cache_ &&
          !waiting_for_clear_flash_content_licenses_ &&
          !waiting_for_clear_channel_ids_ && !waiting_for_clear_cookies_count_ &&
          !waiting_for_clear_domain_reliability_monitor_ &&
          !waiting_for_clear_form_ && !waiting_for_clear_history_ &&
          !waiting_for_clear_hostname_resolution_cache_ &&
          !waiting_for_clear_keyword_data_ && !waiting_for_clear_nacl_cache_ &&
          !waiting_for_clear_network_predictor_ &&
          !waiting_for_clear_networking_history_ &&
          !waiting_for_clear_passwords_ && !waiting_for_clear_passwords_stats_ &&
@@ skipping 221 matching lines @@
   waiting_for_clear_domain_reliability_monitor_ = false;
   NotifyIfDone();
 }
 
 // static
 BrowsingDataRemover::CallbackSubscription
     BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
         const BrowsingDataRemover::Callback& callback) {
   return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
 }