Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/storage_monitor/storage_monitor_chromeos.h

 // 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.
 
 // chromeos::StorageMonitorCros listens for mount point changes and notifies
 // listeners about the addition and deletion of media devices.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_CHROMEOS_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_CHROMEOS_H_
 
 #if !defined(OS_CHROMEOS)
 #error "Should only be used on ChromeOS."
 #endif
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
+namespace chrome {
+class MediaTransferProtocolDeviceObserverLinux;
+}
+
 namespace chromeos {
 
 class StorageMonitorCros
     : public chrome::StorageMonitor,
       public base::RefCountedThreadSafe<StorageMonitorCros>,
       public disks::DiskMountManager::Observer {
  public:
   // Should only be called by browser start up code. Use GetInstance() instead.
   StorageMonitorCros();
 
+  // Sets up disk listeners and issues notifications for any discovered
+  // mount points. Sets up MTP manager and listeners.
+  void Init();
+
   virtual void OnDiskEvent(disks::DiskMountManager::DiskEvent event,
                            const disks::DiskMountManager::Disk* disk) OVERRIDE;
   virtual void OnDeviceEvent(disks::DiskMountManager::DeviceEvent event,
                              const std::string& device_path) OVERRIDE;
   virtual void OnMountEvent(
       disks::DiskMountManager::MountEvent event,
       MountError error_code,
       const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE;
   virtual void OnFormatEvent(disks::DiskMountManager::FormatEvent event,
                              FormatError error_code,
@@ skipping 31 matching lines @@
   // device attach notification. |has_dcim| is true if the attached device has
   // a DCIM folder.
   void AddMountedPathOnUIThread(
       const disks::DiskMountManager::MountPointInfo& mount_info,
       bool has_dcim);
 
   // Mapping of relevant mount points and their corresponding mount devices.
   // Only accessed on the UI thread.
   MountMap mount_map_;
 
+  scoped_ptr<chrome::MediaTransferProtocolDeviceObserverLinux>
+      media_transfer_protocol_device_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(StorageMonitorCros);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_CHROMEOS_H_