Remove DeleteTask and convert remaining users.

chrome/browser/automation/automation_provider_observers.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_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/message_loop_helpers.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/browsing_data_remover.h"
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ skipping 1218 matching lines @@
   virtual void Init();
 
   // content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
-  friend class DeleteTask<PasswordStoreLoginsChangedObserver>;
+  friend class base::DeleteHelper<PasswordStoreLoginsChangedObserver>;
 
   // Registers the appropriate observers.  Called on the DB thread.
   void RegisterObserversTask();
 
   // Sends the |reply_message_| to |automation_| indicating we're done.  Called
   // on the UI thread.
   void IndicateDone();
 
   // Sends an error reply to |automation_|.  Called on the UI thread.
   void IndicateError(const std::string& error);
@@ skipping 203 matching lines @@
   virtual void Init();
 
   // content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
-  friend class DeleteTask<AutofillChangedObserver>;
+  friend class base::DeleteHelper<AutofillChangedObserver>;
 
   // Registers the appropriate observers.  Called on the DB thread.
   void RegisterObserversTask();
 
   // Sends the |reply_message_| to |automation_| indicating we're done.  Called
   // on the UI thread.
   void IndicateDone();
 
   base::WeakPtr<AutomationProvider> automation_;
   scoped_ptr<IPC::Message> reply_message_;
@@ skipping 220 matching lines @@
     : public base::RefCountedThreadSafe<
           WaitForProcessLauncherThreadToGoIdleObserver,
           content::BrowserThread::DeleteOnUIThread> {
  public:
   WaitForProcessLauncherThreadToGoIdleObserver(
       AutomationProvider* automation, IPC::Message* reply_message);
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
-  friend class DeleteTask<WaitForProcessLauncherThreadToGoIdleObserver>;
+  friend class base::DeleteHelper<WaitForProcessLauncherThreadToGoIdleObserver>;
 
   virtual ~WaitForProcessLauncherThreadToGoIdleObserver();
 
   // Schedules a task on the PROCESS_LAUNCHER thread to execute
   // |RunOnProcessLauncherThread2|. By the time the task is executed the
   // PROCESS_LAUNCHER thread should be some what idle.
   void RunOnProcessLauncherThread();
 
   // When executed the PROCESS_LAUNCHER thread should have processed any pending
   // tasks.  Schedules a task on the UI thread that sends the message saying
@@ skipping 130 matching lines @@
  private:
   base::WeakPtr<AutomationProvider> automation_;
   scoped_ptr<IPC::Message> reply_message_;
   std::string extension_id_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPopupObserver);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_