Media galleries: disable detection of attached devices during startup

chrome/browser/system_monitor/removable_device_notifications_window_win.cc

 // 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.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_window_win.h"
 
 #include <windows.h>
 #include <dbt.h>
 #include <fileapi.h>
 
@@ skipping 261 matching lines @@
       0, 0, 0, NULL, NULL, NULL, NULL, NULL,
       &window_class);
   instance_ = window_class.hInstance;
   window_class_ = RegisterClassEx(&window_class);
   DCHECK(window_class_);
 
   window_ = CreateWindow(MAKEINTATOM(window_class_), 0, 0, 0, 0, 0, 0, 0, 0,
                          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(
     const FilePath& device_path) {
   std::string unique_id;
   string16 device_name;
   bool removable;
   if (!get_device_info_func_(device_path, NULL, &unique_id, &device_name,
                              &removable)) {
     return;
@@ skipping 34 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // TODO(kmadhusu) Record device info histogram.
   device_ids_[device] = device_id;
   SystemMonitor::Get()->ProcessRemovableStorageAttached(device_id,
                                                         device_name,
                                                         device.value());
 }
 
 }  // namespace chrome