Remove MediaDeviceMapService references from |DeviceAttachedIntentSource::OnMediaDetached| function.

chrome/browser/intents/device_attached_intent_source.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/intents/device_attached_intent_source.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "base/memory/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/media_gallery/media_storage_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/web_intent_service_data.h"
-#include "webkit/fileapi/media/media_file_system_config.h"
-
-#if defined(SUPPORT_MEDIA_FILESYSTEM)
-#include "webkit/fileapi/media/media_device_map_service.h"
-
-using fileapi::MediaDeviceMapService;
-#endif
 
 using base::SystemMonitor;
 using chrome::MediaStorageUtil;
 using content::WebContentsDelegate;
 using webkit_glue::WebIntentServiceData;
 
 namespace {
 
 // Specifies device attached web intent kAction.
 const char kAction[] = "chrome-extension://attach";
@@ skipping 88 matching lines @@
 }
 
 void DeviceAttachedIntentSource::DispatchIntentsForService(
     const base::SystemMonitor::RemovableStorageInfo& device_info) {
   // Store the media device info locally.
   device_id_map_.insert(std::make_pair(device_info.device_id, device_info));
 
   std::string device_name(UTF16ToUTF8(device_info.name));
   const FilePath device_path(device_info.location);
 
   // TODO(kinuko, kmadhusu): Use a different file system type for MTP.

[vandebo (ex-Chrome), 2012/08/27 20:30:52]

Add a TODO here to get the file system through the MediaFileSystemRegistry so
that it can add the lifetime issues.

[kmadhusu, 2012/08/27 20:44:57]

Done.

   const std::string fs_id = fileapi::IsolatedContext::GetInstance()->
       RegisterFileSystemForPath(fileapi::kFileSystemTypeNativeMedia,
                                 device_path, &device_name);
 
   DCHECK(!fs_id.empty());
   webkit_glue::WebIntentData intent(
       UTF8ToUTF16(kAction), UTF8ToUTF16(kIntentType), device_name, fs_id);
 
   delegate_->WebIntentDispatch(NULL  /* no WebContents */,
                                content::WebIntentsDispatcher::Create(intent));
 }
 
 void DeviceAttachedIntentSource::OnRemovableStorageDetached(
     const std::string& id) {
   DeviceIdToInfoMap::iterator it = device_id_map_.find(id);
   if (it == device_id_map_.end())
     return;
 
-  // TODO(kmadhusu) This should be something like
-  // RevokeFileSystemByDevice(std::string)
   FilePath path(it->second.location);
   fileapi::IsolatedContext::GetInstance()->RevokeFileSystemByPath(path);
-
-#if defined(SUPPORT_MEDIA_FILESYSTEM)
-  // TODO(kmadhusu, vandebo): Clean up this code. http://crbug.com/140340.
-  MediaStorageUtil::Type type;
-  MediaStorageUtil::CrackDeviceId(it->second.device_id, &type, NULL);
-  if (type == MediaStorageUtil::USB_MTP) {
-    MediaDeviceMapService::GetInstance()->RemoveMediaDevice(
-        it->second.location);
-  }
-#endif
   device_id_map_.erase(it);
 }