Storage Monitor: Remove MediaTransferProtocolDeviceObserverLinux::GetInstance() and access it only …

chrome/browser/storage_monitor/media_storage_util.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/storage_monitor/media_storage_util.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/text/bytes_formatting.h"
 
-#if defined(OS_LINUX)  // Implies OS_CHROMEOS
-#include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h"
-#endif
-
 using content::BrowserThread;
 
 namespace chrome {
 
 namespace {
 
 // MediaDeviceNotification.DeviceInfo histogram values.
 enum DeviceInfoHistogramBuckets {
   MASS_STORAGE_DEVICE_NAME_AND_UUID_AVAILABLE,
   MASS_STORAGE_DEVICE_UUID_MISSING,
@@ skipping 260 matching lines @@
                                   done);
 }
 
 // TODO(kmadhusu) Write unit tests for GetDeviceInfoFromPath().
 bool MediaStorageUtil::GetDeviceInfoFromPath(const base::FilePath& path,
                                              StorageInfo* device_info,
                                              base::FilePath* relative_path) {
   if (!path.IsAbsolute())
     return false;
 
-  bool found_device = false;
   StorageInfo info;
   StorageMonitor* monitor = StorageMonitor::GetInstance();
-  found_device = monitor->GetStorageInfoForPath(path, &info);
-
-// TODO(gbillock): Move this upstream into the RemovableStorageNotifications
-// implementation to handle in its GetDeviceInfoForPath call.
-#if defined(OS_LINUX)
-  if (!found_device) {
-    MediaTransferProtocolDeviceObserverLinux* mtp_manager =
-        MediaTransferProtocolDeviceObserverLinux::GetInstance();
-    found_device = mtp_manager->GetStorageInfoForPath(path, &info);
-  }
-#endif
+  bool found_device = monitor->GetStorageInfoForPath(path, &info);
 
   if (found_device && IsRemovableDevice(info.device_id)) {
     base::FilePath sub_folder_path;
     if (path.value() != info.location) {
       base::FilePath device_path(info.location);
       bool success = device_path.AppendRelativePath(path, &sub_folder_path);
       DCHECK(success);
     }
 
 // TODO(gbillock): Don't do this. Leave for clients to do.
@@ skipping 11 matching lines @@
     return true;
   }
 
   // On Posix systems, there's one root so any absolute path could be valid.
 #if !defined(OS_POSIX)
   if (!found_device)
     return false;
 #endif
 
   // Handle non-removable devices. Note: this is just overwriting
-  // good values from RemovableStorageNotifications.
+  // good values from StorageMonitor.
   // TODO(gbillock): Make sure return values from that class are definitive,
   // and don't do this here.
   info.device_id = MakeDeviceId(FIXED_MASS_STORAGE, path.AsUTF8Unsafe());
   info.name = path.BaseName().LossyDisplayName();
   if (device_info)
     *device_info = info;
   if (relative_path)
     *relative_path = base::FilePath();
   return true;
 }
@@ skipping 42 matching lines @@
       static_cast<enum DeviceInfoHistogramBuckets>(event_number);
   if (event >= DEVICE_INFO_BUCKET_BOUNDARY) {
     NOTREACHED();
     return;
   }
   UMA_HISTOGRAM_ENUMERATION("MediaDeviceNotifications.DeviceInfo", event,
                             DEVICE_INFO_BUCKET_BOUNDARY);
 }
 
 }  // namespace chrome