Media galleries: disable detection of attached devices during startup

chrome/browser/system_monitor/removable_device_notifications_window_win.cc

Index: chrome/browser/system_monitor/removable_device_notifications_window_win.cc
diff --git a/chrome/browser/system_monitor/removable_device_notifications_window_win.cc b/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
index bb3caad1f175cedb063235a9596cde3c698c79cf..858928fc4a2d813372971b3eb23116b66f7fbc4f 100644
--- a/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
@@ -279,9 +279,14 @@ void RemovableDeviceNotificationsWindowWin::DoInit(
                          instance_, 0);
   SetWindowLongPtr(window_, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
 
-  std::vector<FilePath> removable_devices = get_attached_devices_func();
-  for (size_t i = 0; i < removable_devices.size(); i++)
-    AddNewDevice(removable_devices[i]);
+  // Disable detection of attached devices during start up (except for tests)
+  // to track down http://crbug.com/150608  Revert if it turns out not to be
+  // the problem.
+  if (get_attached_devices_func != GetAttachedDevices) {
+    std::vector<FilePath> removable_devices = get_attached_devices_func();
+    for (size_t i = 0; i < removable_devices.size(); i++)
+      AddNewDevice(removable_devices[i]);
+  }
 }
 
 void RemovableDeviceNotificationsWindowWin::AddNewDevice(