When clearing plugin data at shutdown, wait for it to finish.

chrome/browser/browsing_data_remover.h

 // Copyright (c) 2010 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>
 
 #include "base/observer_list.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/waitable_event_watcher.h"
 #include "base/time.h"
 #include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/common/notification_registrar.h"
 
 class PluginDataRemover;
 class Profile;
 class URLRequestContextGetter;
 
 namespace disk_cache {
 class Backend;
 }
 
 namespace webkit_database {
 class DatabaseTracker;
 }
 
 // BrowsingDataRemover is responsible for removing data related to browsing:
 // visits in url database, downloads, cookies ...
 
-class BrowsingDataRemover : public NotificationObserver {
+class BrowsingDataRemover : public NotificationObserver,
+                            public base::WaitableEventWatcher::Delegate {
  public:
   // Time period ranges available when doing browsing data removals.
   enum TimePeriod {
     LAST_HOUR = 0,
     LAST_DAY,
     LAST_WEEK,
     FOUR_WEEKS,
     EVERYTHING
   };
 
@@ skipping 55 matching lines @@
   friend class DeleteTask<BrowsingDataRemover>;
   ~BrowsingDataRemover();
 
   // NotificationObserver method. Callback when TemplateURLModel has finished
   // loading. Deletes the entries from the model, and if we're not waiting on
   // anything else notifies observers and deletes this BrowsingDataRemover.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // WaitableEventWatcher implementation.
+  // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
+  virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
+
   // If we're not waiting on anything, notifies observers and deletes this
   // object.
   void NotifyAndDeleteIfDone();
 
   // Callback when the cache has been deleted. Invokes NotifyAndDeleteIfDone.
   void ClearedCache();
 
   // Invoked on the IO thread to delete from the cache.
   void ClearCacheOnIOThread();
 
@@ skipping 16 matching lines @@
   // Invoked on the IO thread to delete from the AppCache, ignoring data from
   // any origins within the |origin_whitelist|.
   void ClearAppCacheOnIOThread(base::Time delete_begin,
                                const std::vector<GURL>& origin_whitelist);
 
   // Lower level helpers.
   void OnGotAppCacheInfo(int rv);
   void OnAppCacheDeleted(int rv);
   ChromeAppCacheService* GetAppCacheService();
 
-  // Callback when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
-  void OnClearedPluginData();
-
   // 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_databases_ &&
            !waiting_for_clear_appcache_ && !waiting_for_clear_lso_data_;
   }
 
@@ skipping 26 matching lines @@
   int appcaches_to_be_deleted_count_;
 
   // Used to delete data from the HTTP caches.
   CacheState next_cache_state_;
   disk_cache::Backend* cache_;
   scoped_refptr<URLRequestContextGetter> main_context_getter_;
   scoped_refptr<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_cache_;
   bool waiting_for_clear_appcache_;
   bool waiting_for_clear_lso_data_;
 
   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_