Media Galleries API Picasa: Make PicasaDataProvider handle async PMP and INI parsing robustly.

chrome/utility/media_galleries/picasa_album_table_reader.cc

 // Copyright 2013 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/utility/media_galleries/picasa_album_table_reader.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/path_service.h"
@@ skipping 71 matching lines @@
     // album-like entities. We ignore those rows.
     if (!category_column.ReadUInt32(i, &category) ||
         !date_column.ReadDouble64(i, &date) ||
         !name_column.ReadString(i, &name) || name.empty() ||
         !uid_column.ReadString(i, &uid) || uid.empty()) {
       continue;
     }
 
     base::Time timestamp = TimeFromMicrosoftVariantTime(date);
 
-    switch (category) {
-      case kAlbumCategoryAlbum: {
-        std::string token;
-        if (!token_column.ReadString(i, &token) || token.empty() ||
-            !StartsWithASCII(token, kAlbumTokenPrefix, false)) {
-          continue;
-        }
+    if (category == kAlbumCategoryAlbum) {
+      std::string token;
+      if (!token_column.ReadString(i, &token) || token.empty() ||
+          !StartsWithASCII(token, kAlbumTokenPrefix, false)) {
+        continue;
+      }
 
-        albums_.push_back(AlbumInfo(name, timestamp, uid, base::FilePath()));
-        break;
-      }
-      case kAlbumCategoryFolder: {
-        std::string filename;
-        if (!filename_column.ReadString(i, &filename) || filename.empty())
-          continue;
+      albums_.push_back(AlbumInfo(name, timestamp, uid, base::FilePath()));
+    } else if (category == kAlbumCategoryFolder) {
+      std::string filename;
+      if (!filename_column.ReadString(i, &filename) || filename.empty())
+        continue;
 
-        base::FilePath path =
-            base::FilePath(base::FilePath::FromUTF8Unsafe(filename));
+      base::FilePath path =
+          base::FilePath(base::FilePath::FromUTF8Unsafe(filename));
 
-        folders_.push_back(AlbumInfo(name, timestamp, uid, path));
-        break;
-      }
-      default: {
-        break;
-      }
+      folders_.push_back(AlbumInfo(name, timestamp, uid, path));
     }
   }
 
   initialized_ = true;
   return true;
 }
 
 }  // namespace picasa