Remove DeleteTask and convert remaining users.

content/browser/host_zoom_map.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.
 
 // Maps hostnames to custom zoom levels.  Written on the UI thread and read on
 // any thread.  One instance per browser context.
 
 #ifndef CONTENT_BROWSER_HOST_ZOOM_MAP_H_
 #define CONTENT_BROWSER_HOST_ZOOM_MAP_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "base/message_loop_helpers.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 // HostZoomMap needs to be deleted on the UI thread because it listens
 // to notifications on there (and holds a NotificationRegistrar).
 class CONTENT_EXPORT HostZoomMap
     : public content::NotificationObserver,
@@ skipping 44 matching lines @@
   double default_zoom_level() const { return default_zoom_level_; }
   void set_default_zoom_level(double level) { default_zoom_level_ = level; }
 
   HostZoomMap* GetOriginal() const { return original_; }
 
  private:
   friend class base::RefCountedThreadSafe<
       HostZoomMap, content::BrowserThread::DeleteOnUIThread>;
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
-  friend class DeleteTask<HostZoomMap>;
+  friend class base::DeleteHelper<HostZoomMap>;
 
   typedef std::map<std::string, double> HostZoomLevels;
 
   virtual ~HostZoomMap();
   void Init();
 
   // Copy of the pref data, so that we can read it on the IO thread.
   HostZoomLevels host_zoom_levels_;
   double default_zoom_level_;
 
@@ skipping 13 matching lines @@
   // Used around accesses to |host_zoom_levels_|, |default_zoom_level_| and
   // |temporary_zoom_levels_| to guarantee thread safety.
   mutable base::Lock lock_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(HostZoomMap);
 };
 
 #endif  // CONTENT_BROWSER_HOST_ZOOM_MAP_H_