[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor_win.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.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_WIN_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_WIN_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace chrome {
 
 namespace test {
 class TestStorageMonitorWin;
 }
 
 class PortableDeviceWatcherWin;
 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.
   virtual void Init() OVERRIDE;
 
   // StorageMonitor:
   virtual bool GetStorageInfoForPath(const base::FilePath& path,
                                      StorageInfo* device_info) const OVERRIDE;
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
       base::string16* storage_object_id) const OVERRIDE;
 
   virtual void EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback) OVERRIDE;
 
  private:
   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,
                      StorageInfo* info) const;
 
   static LRESULT CALLBACK WndProcThunk(HWND hwnd, UINT message, WPARAM wparam,
                                        LPARAM lparam);
 
   LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wparam,
                            LPARAM lparam);
@@ skipping 13 matching lines @@
   // The portable device watcher, used to manage media transfer protocol
   // devices.
   scoped_ptr<PortableDeviceWatcherWin> portable_device_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(StorageMonitorWin);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_WIN_H_