Cleanup: Remove an unneeded variable from ScopedMtpDeviceMapEntry.

chrome/browser/media_gallery/media_file_system_registry.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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
@@ skipping 121 matching lines @@
 // a weak pointer to MediaFileSystemRegistry.
 class ScopedMTPDeviceMapEntry
     : public base::RefCounted<ScopedMTPDeviceMapEntry>,
       public base::SupportsWeakPtr<ScopedMTPDeviceMapEntry> {
  public:
   // |no_references_callback| is called when the last ScopedMTPDeviceMapEntry
   // reference goes away.
   ScopedMTPDeviceMapEntry(const FilePath::StringType& device_location,
                           const base::Closure& no_references_callback)
       : device_location_(device_location),
-        delegate_(new MTPDeviceDelegateImpl(device_location)),
         no_references_callback_(no_references_callback) {
-    DCHECK(delegate_);
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         Bind(&MTPDeviceMapService::AddDelegate,
              base::Unretained(MTPDeviceMapService::GetInstance()),
-             device_location_, make_scoped_refptr(delegate_)));
+             device_location_,
+             make_scoped_refptr(new MTPDeviceDelegateImpl(device_location))));
   }
 
  private:
   // Friend declaration for ref counted implementation.
   friend class base::RefCounted<ScopedMTPDeviceMapEntry>;
 
   // Private because this class is ref-counted.
   ~ScopedMTPDeviceMapEntry() {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         Bind(&MTPDeviceMapService::RemoveDelegate,
              base::Unretained(MTPDeviceMapService::GetInstance()),
              device_location_));
     no_references_callback_.Run();
   }
 
   // Store the MTP or PTP device location.
   const FilePath::StringType device_location_;
 
-  // Store a raw pointer of MTPDeviceDelegateImpl object.
-  // MTPDeviceDelegateImpl is ref-counted and owned by MTPDeviceMapService.
-  // This class tells MTPDeviceMapService to dispose of it when the last
-  // reference to |this| goes away.
-  MTPDeviceDelegateImpl* delegate_;
-
   // A callback to call when the last reference of this object goes away.
   base::Closure no_references_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedMTPDeviceMapEntry);
 };
 #endif
 
 // The main owner of this class is
 // |MediaFileSystemRegistry::extension_hosts_map_|, but a callback may
 // temporarily hold a reference.
@@ skipping 573 matching lines @@
 
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome