Added completion notification to Profile's ClearNetworkingHistorySince.

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 "base/bind.h"
@@ skipping 129 matching lines @@
       waiting_for_clear_cookies_count_(0),
       waiting_for_clear_history_(false),
       waiting_for_clear_local_storage_(false),
       waiting_for_clear_session_storage_(false),
       waiting_for_clear_networking_history_(false),
       waiting_for_clear_server_bound_certs_(false),
       waiting_for_clear_plugin_data_(false),
       waiting_for_clear_quota_managed_data_(false),
       waiting_for_clear_content_licenses_(false),
       waiting_for_clear_form_(false),
+      waiting_for_clear_profile_io_data_(false),
       remove_mask_(0),
       remove_origin_(GURL()),
       origin_set_mask_(0) {
   DCHECK(profile);
   // crbug.com/140910: Many places were calling this with base::Time() as
   // delete_end, even though they should've used base::Time::Max(). Work around
   // it here. New code should use base::Time::Max().
   DCHECK(delete_end_ != base::Time());
   if (delete_end_ == base::Time())
     delete_end_ = base::Time::Max();
@@ skipping 325 matching lines @@
     if (!pepper_flash_settings_manager_.get()) {
       pepper_flash_settings_manager_.reset(
           new PepperFlashSettingsManager(this, profile_));
     }
     deauthorize_content_licenses_request_id_ =
         pepper_flash_settings_manager_->DeauthorizeContentLicenses();
   }
 
   // Also delete cached network related data (like TransportSecurityState,
   // HttpServerProperties data).
-  profile_->ClearNetworkingHistorySince(delete_begin_);
-
-  NotifyAndDeleteIfDone();
+  waiting_for_clear_profile_io_data_ = true;
+  profile_->ClearNetworkingHistorySince(
+      delete_begin_,
+      base::Bind(&BrowsingDataRemover::ClearedProfileIOData,
+                 base::Unretained(this)));

[mmenke, 2012/10/25 16:01:15]

This strikes me as very regression-prone.  Since OffTheRecordProfileImpl will
cause synchronous deletion, if all the other waiting_for_* flags are false,
anything else put below this line will cause a crash for incognito profiles in
that case, but not for ProfileImpls.

My suggestion is to either make the callback async for the incognito profile
(And update Profile API docs to mention this).

Could also have it return some indication whether it ran synchronously or not,
but think that's a bit counter-intuitive.

[engedy, 2012/10/25 19:41:31]

Done.

 }
 
 void BrowsingDataRemover::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void BrowsingDataRemover::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
@@ skipping 40 matching lines @@
       !waiting_for_clear_nacl_cache_ &&
       !waiting_for_clear_cookies_count_&&
       !waiting_for_clear_history_ &&
       !waiting_for_clear_local_storage_ &&
       !waiting_for_clear_session_storage_ &&
       !waiting_for_clear_networking_history_ &&
       !waiting_for_clear_server_bound_certs_ &&
       !waiting_for_clear_plugin_data_ &&
       !waiting_for_clear_quota_managed_data_ &&
       !waiting_for_clear_content_licenses_ &&
-      !waiting_for_clear_form_;
+      !waiting_for_clear_form_ &&
+      !waiting_for_clear_profile_io_data_;
 }
 
 void BrowsingDataRemover::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   // TODO(brettw) bug 1139736: This should also observe session
   // clearing (what about other things such as passwords, etc.?) and wait for
   // them to complete before continuing.
   DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
   TemplateURLService* model = content::Source<TemplateURLService>(source).ptr();
@@ skipping 398 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataRemover::OnClearedFormData,
                  base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnClearedFormData() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_form_ = false;
   NotifyAndDeleteIfDone();
 }
+
+void BrowsingDataRemover::ClearedProfileIOData() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  waiting_for_clear_profile_io_data_ = false;
+  NotifyAndDeleteIfDone();
+}
+