Update Windows System Monitor Removable Device Impl.

chrome/browser/media_gallery/media_galleries_preferences.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/media_gallery/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 119 matching lines @@
     : profile_(profile) {
   // Populate the default galleries if this is a fresh profile.
   MediaGalleryPrefId current_id =
       profile_->GetPrefs()->GetUint64(prefs::kMediaGalleriesUniqueId);
   if (current_id == kInvalidMediaGalleryPrefId + 1) {
     FilePath pictures_path;
     if (PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path)) {
       std::string device_id;
       string16 display_name;
       FilePath relative_path;
-      MediaStorageUtil::GetDeviceInfoFromPath(pictures_path, &device_id,
-                                              &display_name, &relative_path);
-      AddGallery(device_id, display_name, relative_path, false /*user added*/);
+      if (MediaStorageUtil::GetDeviceInfoFromPath(pictures_path, &device_id,
+                                                  &display_name,
+                                                  &relative_path)) {
+        AddGallery(device_id, display_name, relative_path,
+                   false /*user added*/);
+      }
     }
   }
   InitFromPrefs();
 }
 
 MediaGalleriesPreferences::~MediaGalleriesPreferences() {}
 
 void MediaGalleriesPreferences::InitFromPrefs() {
   known_galleries_.clear();
   device_map_.clear();
@@ skipping 15 matching lines @@
       device_map_[gallery_info.device_id].insert(gallery_info.pref_id);
   }
 }
 
 bool MediaGalleriesPreferences::LookUpGalleryByPath(
     const FilePath& path,
     MediaGalleryPrefInfo* gallery_info) const {
   std::string device_id;
   string16 device_name;
   FilePath relative_path;
-  MediaStorageUtil::GetDeviceInfoFromPath(path, &device_id, &device_name,
-                                          &relative_path);
+  if (!MediaStorageUtil::GetDeviceInfoFromPath(path, &device_id, &device_name,
+                                               &relative_path)) {
+    if (gallery_info) {
+      gallery_info->pref_id = kInvalidMediaGalleryPrefId;
+      gallery_info->display_name = string16();
+      gallery_info->device_id = std::string();
+      gallery_info->path = FilePath();
+      gallery_info->type = MediaGalleryPrefInfo::kBlackListed;
+    }
+    return false;
+  }
   relative_path = relative_path.NormalizePathSeparators();
   MediaGalleryPrefIdSet galleries_on_device =
       LookUpGalleriesByDeviceId(device_id);
   for (MediaGalleryPrefIdSet::const_iterator it = galleries_on_device.begin();
        it != galleries_on_device.end();
        ++it) {
     const MediaGalleryPrefInfo& gallery = known_galleries_.find(*it)->second;
     if (gallery.path != relative_path)
       continue;
 
@@ skipping 200 matching lines @@
 }
 
 extensions::ExtensionPrefs*
 MediaGalleriesPreferences::GetExtensionPrefs() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->extension_prefs();
 }
 
 } // namespace chrome