Update BrowsingDataRemover with the asynchronous CookieMonster API.

chrome/browser/browsing_data_remover.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 153 matching lines @@
   // Invoked on the IO thread to delete from the AppCache.
   void ClearAppCacheOnIOThread();
 
   // Lower level helpers.
   void OnGotAppCacheInfo(int rv);
   void OnAppCacheDeleted(int rv);
 
   // Callback when Gears data has been deleted. Invokes NotifyAndDeleteIfDone.
   void OnClearedGearsData();
 
+  // Callback when Cookies has been deleted. Invokes NotifyAndDeleteIfDone.
+  void OnCookiesDeleted(int num_deleted);
+
   // Invoked on the FILE thread to delete old Gears data.
   void ClearGearsDataOnFILEThread(const FilePath& profile_dir);
 
   // Calculate the begin time for the deletion range specified by |time_period|.
   base::Time CalculateBeginDeleteTime(TimePeriod time_period);
 
   // Returns true if we're all done.
   bool all_done() {
     return registrar_.IsEmpty() && !waiting_for_clear_cache_ &&
            !waiting_for_clear_history_ &&
+           !waiting_for_clear_cookies_&&
            !waiting_for_clear_networking_history_ &&
            !waiting_for_clear_databases_ && !waiting_for_clear_appcache_ &&
            !waiting_for_clear_lso_data_ && !waiting_for_clear_gears_data_ &&
            !waiting_for_clear_file_systems_;
   }
 
   NotificationRegistrar registrar_;
 
   // Profile we're to remove from.
   Profile* profile_;
@@ skipping 32 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> media_context_getter_;
 
   // Used to delete plugin data.
   scoped_refptr<PluginDataRemover> plugin_data_remover_;
   base::WaitableEventWatcher watcher_;
 
   // True if we're waiting for various data to be deleted.
   bool waiting_for_clear_databases_;
   bool waiting_for_clear_history_;
   bool waiting_for_clear_networking_history_;
+  bool waiting_for_clear_cookies_;
   bool waiting_for_clear_cache_;
   bool waiting_for_clear_appcache_;
   bool waiting_for_clear_lso_data_;
   bool waiting_for_clear_gears_data_;
   bool waiting_for_clear_file_systems_;
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_REMOVER_H_