Add missing fields in Drive V2 API parser.

chrome/browser/chromeos/gdata/drive_api_parser.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/chromeos/gdata/drive_api_parser.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 14 matching lines @@
 // Converts |url_string| to |result|.  Always returns true to be used
 // for JSONValueConverter::RegisterCustomField method.
 // TODO(mukai): make it return false in case of invalid |url_string|.
 bool GetGURLFromString(const base::StringPiece& url_string, GURL* result) {
   *result = GURL(url_string.as_string());
   return true;
 }
 
 // Drive v2 API JSON names.
 
+// Definition order follows the order of documentation in
+// https://developers.google.com/drive/v2/reference/
+
 // Common
 const char kKind[] = "kind";
 const char kId[] = "id";
 const char kETag[] = "etag";
+const char kSelfLink[] = "selfLink";
 const char kItems[] = "items";
 const char kLargestChangeId[] = "largestChangeId";
 
-// About Resource:
+// About Resource
+// https://developers.google.com/drive/v2/reference/about
 const char kAboutKind[] = "drive#about";
-const char kRootFolderId[] = "rootFolderId";
 const char kQuotaBytesTotal[] = "quotaBytesTotal";
 const char kQuotaBytesUsed[] = "quotaBytesUsed";
+const char kRootFolderId[] = "rootFolderId";
 
-// App Icon:
+// App Icon
+// https://developers.google.com/drive/v2/reference/apps
 const char kCategory[] = "category";
 const char kSize[] = "size";
 const char kIconUrl[] = "iconUrl";
 
-// Apps Resource:
+// Apps Resource
+// https://developers.google.com/drive/v2/reference/apps
 const char kAppKind[] = "drive#app";
 const char kName[] = "name";
 const char kObjectType[] = "objectType";
 const char kSupportsCreate[] = "supportsCreate";
 const char kSupportsImport[] = "supportsImport";
 const char kInstalled[] = "installed";
 const char kAuthorized[] = "authorized";
 const char kProductUrl[] = "productUrl";
 const char kPrimaryMimeTypes[] = "primaryMimeTypes";
 const char kSecondaryMimeTypes[] = "secondaryMimeTypes";
 const char kPrimaryFileExtensions[] = "primaryFileExtensions";
 const char kSecondaryFileExtensions[] = "secondaryFileExtensions";
 const char kIcons[] = "icons";
 
-// Apps List:
+// Apps List
+// https://developers.google.com/drive/v2/reference/apps/list
 const char kAppListKind[] = "drive#appList";
 
-// Parent Resource:
+// Parent Resource
+// https://developers.google.com/drive/v2/reference/parents
 const char kParentReferenceKind[] = "drive#parentReference";
+const char kParentLink[] = "parentLink";
 const char kIsRoot[] = "isRoot";
 
-// File Resource:
+// File Resource
+// https://developers.google.com/drive/v2/reference/files
 const char kFileKind[] = "drive#file";
+const char kTitle[] = "title";
 const char kMimeType[] = "mimeType";
-const char kTitle[] = "title";
+const char kCreatedDate[] = "createdDate";
 const char kModifiedByMeDate[] = "modifiedByMeDate";
-const char kParents[] = "parents";
 const char kDownloadUrl[] = "downloadUrl";
 const char kFileExtension[] = "fileExtension";
 const char kMd5Checksum[] = "md5Checksum";
 const char kFileSize[] = "fileSize";
+const char kAlternateLink[] = "alternateLink";
+const char kEmbedLink[] = "embedLink";
+const char kParents[] = "parents";
+const char kThumbnailLink[] = "thumbnailLink";
+const char kWebContentLink[] = "webContentLink";
 
 const char kDriveFolderMimeType[] = "application/vnd.google-apps.folder";
 
-// Files List:
+// Files List
+// https://developers.google.com/drive/v2/reference/files/list
 const char kFileListKind[] = "drive#fileList";
 const char kNextPageToken[] = "nextPageToken";
 const char kNextLink[] = "nextLink";
 
-// Change Resource:
+// Change Resource
+// https://developers.google.com/drive/v2/reference/changes
 const char kChangeKind[] = "drive#change";
 const char kFileId[] = "fileId";
+const char kDeleted[] = "deleted";
 const char kFile[] = "file";
 
-// Changes List:
+// Changes List
+// https://developers.google.com/drive/v2/reference/changes/list
 const char kChangeListKind[] = "drive#changeList";
 
 // Maps category name to enum IconCategory.
 struct AppIconCategoryMap {
   gdata::DriveAppIcon::IconCategory category;
   const char* category_name;
 };
 
 const AppIconCategoryMap kAppIconCategoryMap[] = {
   { gdata::DriveAppIcon::DOCUMENT, "document" },
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 // TODO(kochi): Rename to namespace drive. http://crbug.com/136371
 namespace gdata {
 
 ////////////////////////////////////////////////////////////////////////////////
 // AboutResource implementation
 
 AboutResource::AboutResource()
-    : quota_bytes_total_(0),
-      quota_bytes_used_(0),
-      largest_change_id_(0) {}
+    : largest_change_id_(0),
+      quota_bytes_total_(0),
+      quota_bytes_used_(0) {}
 
 AboutResource::~AboutResource() {}
 
 // static
 scoped_ptr<AboutResource> AboutResource::CreateFrom(const base::Value& value) {
   scoped_ptr<AboutResource> resource(new AboutResource());
   if (!IsResourceKindExpected(value, kAboutKind) || !resource->Parse(value)) {
     LOG(ERROR) << "Unable to create: Invalid About resource JSON!";
     return scoped_ptr<AboutResource>(NULL);
   }
   return resource.Pass();
 }
 
 // static
 void AboutResource::RegisterJSONConverter(
     base::JSONValueConverter<AboutResource>* converter) {
-  converter->RegisterStringField(kRootFolderId,
-                                 &AboutResource::root_folder_id_);
+  converter->RegisterCustomField<int64>(kLargestChangeId,
+                                        &AboutResource::largest_change_id_,
+                                        &base::StringToInt64);
   converter->RegisterCustomField<int64>(kQuotaBytesTotal,
                                         &AboutResource::quota_bytes_total_,
                                         &base::StringToInt64);
   converter->RegisterCustomField<int64>(kQuotaBytesUsed,
                                         &AboutResource::quota_bytes_used_,
                                         &base::StringToInt64);
-  converter->RegisterCustomField<int64>(kLargestChangeId,
-                                        &AboutResource::largest_change_id_,
-                                        &base::StringToInt64);
+  converter->RegisterStringField(kRootFolderId,
+                                 &AboutResource::root_folder_id_);
 }
 
 bool AboutResource::Parse(const base::Value& value) {
   base::JSONValueConverter<AboutResource> converter;
   if (!converter.Convert(value, this)) {
     LOG(ERROR) << "Unable to parse: Invalid About resource JSON!";
     return false;
   }
   return true;
 }
@@ skipping 138 matching lines @@
 // ParentReference implementation
 
 ParentReference::ParentReference() : is_root_(false) {}
 
 ParentReference::~ParentReference() {}
 
 // static
 void ParentReference::RegisterJSONConverter(
     base::JSONValueConverter<ParentReference>* converter) {
   converter->RegisterStringField(kId, &ParentReference::file_id_);
+  converter->RegisterCustomField<GURL>(kParentLink,
+                                       &ParentReference::parent_link_,
+                                       GetGURLFromString);
   converter->RegisterBoolField(kIsRoot, &ParentReference::is_root_);
 }
 
 // static
 scoped_ptr<ParentReference>
 ParentReference::CreateFrom(const base::Value& value) {
   scoped_ptr<ParentReference> reference(new ParentReference());
   if (!IsResourceKindExpected(value, kParentReferenceKind) ||
       !reference->Parse(value)) {
     LOG(ERROR) << "Unable to create: Invalid ParentRefernce JSON!";
@@ skipping 16 matching lines @@
 
 FileResource::FileResource() : file_size_(0) {}
 
 FileResource::~FileResource() {}
 
 // static
 void FileResource::RegisterJSONConverter(
     base::JSONValueConverter<FileResource>* converter) {
   converter->RegisterStringField(kId, &FileResource::file_id_);
   converter->RegisterStringField(kETag, &FileResource::etag_);
+  converter->RegisterCustomField<GURL>(kSelfLink,
+                                       &FileResource::self_link_,
+                                       GetGURLFromString);
+  converter->RegisterStringField(kTitle, &FileResource::title_);
   converter->RegisterStringField(kMimeType, &FileResource::mime_type_);
-  converter->RegisterStringField(kTitle, &FileResource::title_);
+  converter->RegisterCustomField<base::Time>(
+      kCreatedDate,
+      &FileResource::created_date_,
+      &gdata::util::GetTimeFromString);
   converter->RegisterCustomField<base::Time>(
       kModifiedByMeDate,
       &FileResource::modified_by_me_date_,
       &gdata::util::GetTimeFromString);
-  converter->RegisterRepeatedMessage<ParentReference>(kParents,
-                                                      &FileResource::parents_);
   converter->RegisterCustomField<GURL>(kDownloadUrl,
                                        &FileResource::download_url_,
                                        GetGURLFromString);
   converter->RegisterStringField(kFileExtension,
                                  &FileResource::file_extension_);
   converter->RegisterStringField(kMd5Checksum, &FileResource::md5_checksum_);
   converter->RegisterCustomField<int64>(kFileSize,
                                         &FileResource::file_size_,
                                         &base::StringToInt64);
+  converter->RegisterCustomField<GURL>(kAlternateLink,
+                                       &FileResource::alternate_link_,
+                                       GetGURLFromString);
+  converter->RegisterCustomField<GURL>(kEmbedLink,
+                                       &FileResource::embed_link_,
+                                       GetGURLFromString);
+  converter->RegisterRepeatedMessage<ParentReference>(kParents,
+                                                      &FileResource::parents_);
+  converter->RegisterCustomField<GURL>(kThumbnailLink,
+                                       &FileResource::thumbnail_link_,
+                                       GetGURLFromString);
+  converter->RegisterCustomField<GURL>(kWebContentLink,
+                                       &FileResource::web_content_link_,
+                                       GetGURLFromString);
 }
 
 // static
 scoped_ptr<FileResource> FileResource::CreateFrom(const base::Value& value) {
   scoped_ptr<FileResource> resource(new FileResource());
   if (!IsResourceKindExpected(value, kFileKind) || !resource->Parse(value)) {
     LOG(ERROR) << "Unable to create: Invalid FileResource JSON!";
     return scoped_ptr<FileResource>(NULL);
   }
   return resource.Pass();
@@ skipping 58 matching lines @@
 
 ChangeResource::~ChangeResource() {}
 
 // static
 void ChangeResource::RegisterJSONConverter(
     base::JSONValueConverter<ChangeResource>* converter) {
   converter->RegisterCustomField<int64>(kId,
                                         &ChangeResource::change_id_,
                                         &base::StringToInt64);
   converter->RegisterStringField(kFileId, &ChangeResource::file_id_);
+  converter->RegisterBoolField(kDeleted, &ChangeResource::deleted_);
   converter->RegisterNestedField(kFile, &ChangeResource::file_);
 }
 
 // static
 scoped_ptr<ChangeResource>
 ChangeResource::CreateFrom(const base::Value& value) {
   scoped_ptr<ChangeResource> resource(new ChangeResource());
   if (!IsResourceKindExpected(value, kChangeKind) || !resource->Parse(value)) {
     LOG(ERROR) << "Unable to create: Invalid ChangeResource JSON!";
     return scoped_ptr<ChangeResource>(NULL);
@@ skipping 46 matching lines @@
 bool ChangeList::Parse(const base::Value& value) {
   base::JSONValueConverter<ChangeList> converter;
   if (!converter.Convert(value, this)) {
     LOG(ERROR) << "Unable to parse: Invalid ChangeList";
     return false;
   }
   return true;
 }
 
 }  // namespace gdata