[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor_win.h

Index: chrome/browser/storage_monitor/storage_monitor_win.h
diff --git a/chrome/browser/storage_monitor/storage_monitor_win.h b/chrome/browser/storage_monitor/storage_monitor_win.h
index 6472c0df6a2e2383f377c52229fb245511fe87c6..fd876d52247c75195adad56d96b99dc0ecd0def3 100644
--- a/chrome/browser/storage_monitor/storage_monitor_win.h
+++ b/chrome/browser/storage_monitor/storage_monitor_win.h
@@ -25,10 +25,11 @@ class VolumeMountWatcherWin;
 
 class StorageMonitorWin : public StorageMonitor {
  public:
-  // Creates an instance of StorageMonitorWin. Should only be called by browser
-  // start up code. Use GetInstance() instead.
-  static StorageMonitorWin* Create();
-
+  // To support unit tests, this constructor takes |volume_mount_watcher| and
+  // |portable_device_watcher| objects. These params are either constructed in
+  // unit tests or in StorageMonitorWin::Create() function.
+  StorageMonitorWin(VolumeMountWatcherWin* volume_mount_watcher,

[vandebo (ex-Chrome), 2013/07/09 15:38:12]

Can this stay private?

[Greg Billock, 2013/07/09 17:35:21]

Taking out Create() here means the factory method calls the constructor. The
test does as well. I could just add more friends. Shall I do that?

[vandebo (ex-Chrome), 2013/07/09 21:14:11]

I think this constructor is only used for testing, right?  If, so it should be
private with friends.

[Greg Billock, 2013/07/09 21:29:06]

It's used by the factory as well. (The factory used to use the Create() method
above, but that's just confusing since we have the parent class Create method.)

[vandebo (ex-Chrome), 2013/07/10 16:57:45]

Which factory?  Searching the diff shows it used in unit tests and the Create
method.

[Greg Billock, 2013/07/10 21:11:16]

The StorageMonitor::Create method was what I meant.

+                    PortableDeviceWatcherWin* portable_device_watcher);
   virtual ~StorageMonitorWin();
 
   // Must be called after the file thread is created.
@@ -50,12 +51,6 @@ class StorageMonitorWin : public StorageMonitor {
   class PortableDeviceNotifications;
   friend class test::TestStorageMonitorWin;
 
-  // To support unit tests, this constructor takes |volume_mount_watcher| and
-  // |portable_device_watcher| objects. These params are either constructed in
-  // unit tests or in StorageMonitorWin::Create() function.
-  StorageMonitorWin(VolumeMountWatcherWin* volume_mount_watcher,
-                    PortableDeviceWatcherWin* portable_device_watcher);
-
   // Gets the removable storage information given a |device_path|. On success,
   // returns true and fills in |info|.
   bool GetDeviceInfo(const base::FilePath& device_path,