Clean up MediaStorageUtil

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 137 matching lines @@
   };
 
   for (size_t i = 0; i < arraysize(kDirectoryKeys); ++i) {
     FilePath path;
     if (!PathService::Get(kDirectoryKeys[i], &path))
       continue;
 
     std::string device_id;
     string16 display_name;
     FilePath relative_path;
-    MediaStorageUtil::GetDeviceInfoFromPath(
-        path, &device_id, &display_name, &relative_path);
-    AddGallery(device_id, display_name, relative_path, false /*user added*/);
+    if (MediaStorageUtil::GetDeviceInfoFromPath(path, &device_id, &display_name,
+                                                &relative_path)) {
+      AddGallery(device_id, display_name, relative_path, false /*user added*/);
+    }
   }
 }
 
 void MediaGalleriesPreferences::InitFromPrefs() {
   known_galleries_.clear();
   device_map_.clear();
 
   PrefService* prefs = profile_->GetPrefs();
   const ListValue* list = prefs->GetList(
       prefs::kMediaGalleriesRememberedGalleries);
@@ skipping 12 matching lines @@
     }
   }
 }
 
 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