Storage Monitor Linux: Do not try to initialize MediaTransferProtocolManager during unit tests.

chrome/browser/storage_monitor/storage_monitor_linux.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.
 
 // StorageMonitorLinux listens for mount point changes, notifies listeners
 // about the addition and deletion of media devices, and answers queries about
 // mounted devices.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_LINUX_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_LINUX_H_
@@ skipping 87 matching lines @@
   // (mount point, priority)
   // For devices that are mounted to multiple mount points, this helps us track
   // which one we've notified system monitor about.
   typedef std::map<base::FilePath, bool> ReferencedMountPoint;
 
   // (mount device, map of known mount points)
   // For each mount device, track the places it is mounted and which one (if
   // any) we have notified system monitor about.
   typedef std::map<base::FilePath, ReferencedMountPoint> MountPriorityMap;
 
+  // Returns true if this StorageMonitorLinux instance is used for a test.
+  virtual bool IsRunningTest() const;

[Greg Billock, 2013/03/26 16:03:43]

Instead of this, can we make some virtuals that set up and tear down the
manager, and then no-op them in the test?

+
   // Do initialization on the File Thread.
   void InitOnFileThread();
 
   // Parses mtab file and find all changes.
   void UpdateMtab();
 
   // Adds |mount_device| as mounted on |mount_point|.  If the device is a new
   // device any listeners are notified.
   void AddNewMount(const base::FilePath& mount_device,
                    const base::FilePath& mount_point);
@@ skipping 27 matching lines @@
 
   scoped_ptr<MediaTransferProtocolDeviceObserverLinux>
       media_transfer_protocol_device_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(StorageMonitorLinux);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_LINUX_H_