Fix remaining leaks in StorageMonitorLinux.

chrome/browser/storage_monitor/test_storage_monitor.h

 // Copyright (c) 2013 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_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_
 
 #include <string>
 
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 
 namespace chrome {
 namespace test {
 
 class TestStorageMonitor : public chrome::StorageMonitor {
  public:
   TestStorageMonitor();
   virtual ~TestStorageMonitor();
 
   virtual void Init() OVERRIDE;
 
   void MarkInitialized();
 
   // Create and initialize a new TestStorageMonitor and install it
-  // in the TestingBrowserProcess.
+  // in the TestingBrowserProcess. The TestingBrowserProcess owns the created
+  // TestStorageMonitor, but it is also returned for convenience. If there is
+  // no TestingBrowserProcess to own the TestStorageMonitor, it is destroyed
+  // and the return value is NULL.
   static TestStorageMonitor* CreateAndInstall();
 
   // Create and initialize a new TestStorageMonitor, and install it
   // in the BrowserProcessImpl. (Browser tests use the production browser
-  // process implementation.)
+  // process implementation.) The BrowserProcessImpl owns the created
+  // TestStorageMonitor, but it is also returned for convenience.
   static TestStorageMonitor* CreateForBrowserTests();
 
   // Remove the singleton StorageMonitor from the TestingBrowserProcess.
   static void RemoveSingleton();
 
   // Synchronously initialize the current storage monitor.
   static void SyncInitialize();
 
   virtual bool GetStorageInfoForPath(
       const base::FilePath& path,
@@ skipping 13 matching lines @@
 
   virtual Receiver* receiver() const OVERRIDE;
 
   virtual void EjectDevice(
       const std::string& device_id,
       base::Callback<void(StorageMonitor::EjectStatus)> callback)
       OVERRIDE;
 
   const std::string& ejected_device() const { return ejected_device_; }
 
+  bool init_called() const { return init_called_; }
+
+ private:
+  // Whether TestStorageMonitor::Init() has been called for not.
   bool init_called_;
 
- private:
+  // The last device to be ejected.
   std::string ejected_device_;
 
 #if defined(OS_LINUX)
   scoped_ptr<device::MediaTransferProtocolManager>
       media_transfer_protocol_manager_;
 #endif
 };
 
 }  // namespace test
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_