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

chrome/browser/storage_monitor/storage_monitor_linux.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.
 
 // StorageMonitorLinux implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
@@ skipping 240 matching lines @@
       base::Bind(&StorageMonitorLinux::OnMtabWatcherCreated,
                  weak_ptr_factory_.GetWeakPtr()));
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
     scoped_refptr<base::MessageLoopProxy> loop_proxy;
     loop_proxy = content::BrowserThread::GetMessageLoopProxyForThread(
         content::BrowserThread::FILE);
     device::MediaTransferProtocolManager::Initialize(loop_proxy);
 
     media_transfer_protocol_device_observer_.reset(
-        new MediaTransferProtocolDeviceObserverLinux());
-    media_transfer_protocol_device_observer_->SetNotifications(receiver());
+        new MediaTransferProtocolDeviceObserverLinux(receiver()));
   }
 }
 
 bool StorageMonitorLinux::GetStorageInfoForPath(
     const base::FilePath& path,
     StorageInfo* device_info) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  // TODO(thestig) |media_transfer_protocol_device_observer_| should always be
+  // valid.
+  if (media_transfer_protocol_device_observer_ &&
+      media_transfer_protocol_device_observer_->GetStorageInfoForPath(
+          path, device_info)) {
+    return true;
+  }
+
   if (!path.IsAbsolute())
     return false;
 
   base::FilePath current = path;
   while (!ContainsKey(mount_info_map_, current) && current != current.DirName())
     current = current.DirName();
 
   MountMap::const_iterator mount_info = mount_info_map_.find(current);
   if (mount_info == mount_info_map_.end())
     return false;
@@ skipping 149 matching lines @@
 
   if (removable) {
     // TODO(gbillock) Do this in a higher level instead of here.
     storage_info->name = MediaStorageUtil::GetDisplayNameForDevice(
         storage_info->total_size_in_bytes, storage_info->name);
     receiver()->ProcessAttach(*storage_info);
   }
 }
 
 }  // namespace chrome