[MediaGalleries] iPhoto: Add original file field to the parser. Dedupe album names.

chrome/common/media_galleries/iphoto_library.h

 // 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.
 
 // These data structures can be used to describe the contents of an iPhoto
 // library.
 
 #ifndef CHROME_COMMON_MEDIA_GALLERIES_IPHOTO_LIBRARY_H_
 #define CHROME_COMMON_MEDIA_GALLERIES_IPHOTO_LIBRARY_H_
 
 #include <map>
 #include <set>
 
 #include "base/files/file_path.h"
 
 namespace iphoto {
 namespace parser {
 
 struct Photo {
   Photo();
-  Photo(uint64 id, const base::FilePath& location);
+  Photo(uint64 id,
+        const base::FilePath& location,
+        const base::FilePath& original_location);
   bool operator<(const Photo& other) const;
 
   uint64 id;
   base::FilePath location;
+  base::FilePath original_location;
 };
 
 typedef std::set<uint64> Album;
 typedef std::map<std::string /*album name*/, Album> Albums;
 
 struct Library {
   Library();
   Library(const Albums& albums, const std::set<Photo>& all_photos);
   ~Library();
 
   Albums albums;
   std::set<Photo> all_photos;
 };
 
 }  // namespace parser
 }  // namespace iphoto
 
 #endif  // CHROME_COMMON_MEDIA_GALLERIES_IPHOTO_LIBRARY_H_