drive: Stop requesting unused URLs

Remove self_link_, download_url_, embed_link_, thumbnail_link_ and web_content_link_ from FileResource.

BUG=347871
TEST=unit_tests

Review URL: https://codereview.chromium.org/184193003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254142 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 7 insertions, 111 deletions

diff --git a/chrome/browser/drive/drive_api_service.cc b/chrome/browser/drive/drive_api_service.cc
index c5eba1b..7beb381 100644
--- a/chrome/browser/drive/drive_api_service.cc
+++ b/chrome/browser/drive/drive_api_service.cc
@@ -103,24 +103,24 @@ const int kMaxNumFilesResourcePerRequestForSearch = 100;
 const char kAboutResourceFields[] =
     "kind,quotaBytesTotal,quotaBytesUsed,largestChangeId,rootFolderId";
 const char kFileResourceFields[] =
-    "kind,id,title,createdDate,sharedWithMeDate,downloadUrl,mimeType,"
+    "kind,id,title,createdDate,sharedWithMeDate,mimeType,"
     "md5Checksum,fileSize,labels/trashed,imageMediaMetadata/width,"
     "imageMediaMetadata/height,imageMediaMetadata/rotation,etag,"
-    "parents/parentLink,selfLink,thumbnailLink,alternateLink,embedLink,"
+    "parents/parentLink,alternateLink,"
     "modifiedDate,lastViewedByMeDate,shared";
 const char kFileResourceOpenWithLinksFields[] =
     "kind,id,openWithLinks/*";
 const char kFileListFields[] =
-    "kind,items(kind,id,title,createdDate,sharedWithMeDate,downloadUrl,"
+    "kind,items(kind,id,title,createdDate,sharedWithMeDate,"
     "mimeType,md5Checksum,fileSize,labels/trashed,imageMediaMetadata/width,"
     "imageMediaMetadata/height,imageMediaMetadata/rotation,etag,"
-    "parents/parentLink,selfLink,thumbnailLink,alternateLink,embedLink,"
+    "parents/parentLink,alternateLink,"
     "modifiedDate,lastViewedByMeDate,shared),nextLink";
 const char kChangeListFields[] =
-    "kind,items(file(kind,id,title,createdDate,sharedWithMeDate,downloadUrl,"
+    "kind,items(file(kind,id,title,createdDate,sharedWithMeDate,"
     "mimeType,md5Checksum,fileSize,labels/trashed,imageMediaMetadata/width,"
     "imageMediaMetadata/height,imageMediaMetadata/rotation,etag,"
-    "parents/parentLink,selfLink,thumbnailLink,alternateLink,embedLink,"
+    "parents/parentLink,alternateLink,"
     "modifiedDate,lastViewedByMeDate,shared),deleted,id,fileId),nextLink,"
     "largestChangeId";
 
diff --git a/chrome/browser/drive/drive_api_util.cc b/chrome/browser/drive/drive_api_util.cc
index b6b35e9..5c0eadb 100644
--- a/chrome/browser/drive/drive_api_util.cc
+++ b/chrome/browser/drive/drive_api_util.cc
@@ -323,7 +323,6 @@ scoped_ptr<google_apis::FileResource> ConvertResourceEntryToFileResource(
   file->set_shared(std::find(entry.labels().begin(), entry.labels().end(),
                              "shared") != entry.labels().end());
 
-  file->set_download_url(entry.download_url());
   if (entry.is_folder()) {
     file->set_mime_type(kDriveFolderMimeType);
   } else {
@@ -362,18 +361,9 @@ scoped_ptr<google_apis::FileResource> ConvertResourceEntryToFileResource(
         parents.push_back(parent.release());
         break;
       }
-      case Link::LINK_EDIT:
-        file->set_self_link(link.href());
-        break;
-      case Link::LINK_THUMBNAIL:
-        file->set_thumbnail_link(link.href());
-        break;
       case Link::LINK_ALTERNATE:
         file->set_alternate_link(link.href());
         break;
-      case Link::LINK_EMBED:
-        file->set_embed_link(link.href());
-        break;
       default:
         break;
     }
@@ -431,7 +421,6 @@ ConvertFileResourceToResourceEntry(
   // This should be the url to download the file_resource.
   {
     google_apis::Content content;
-    content.set_url(file_resource.download_url());
     content.set_mime_type(file_resource.mime_type());
     entry->set_content(content);
   }
@@ -464,30 +453,12 @@ ConvertFileResourceToResourceEntry(
     link->set_href(file_resource.parents()[i]->parent_link());
     links.push_back(link);
   }
-  if (!file_resource.self_link().is_empty()) {
-    google_apis::Link* link = new google_apis::Link;
-    link->set_type(google_apis::Link::LINK_EDIT);
-    link->set_href(file_resource.self_link());
-    links.push_back(link);
-  }
-  if (!file_resource.thumbnail_link().is_empty()) {
-    google_apis::Link* link = new google_apis::Link;
-    link->set_type(google_apis::Link::LINK_THUMBNAIL);
-    link->set_href(file_resource.thumbnail_link());
-    links.push_back(link);
-  }
   if (!file_resource.alternate_link().is_empty()) {
     google_apis::Link* link = new google_apis::Link;
     link->set_type(google_apis::Link::LINK_ALTERNATE);
     link->set_href(file_resource.alternate_link());
     links.push_back(link);
   }
-  if (!file_resource.embed_link().is_empty()) {
-    google_apis::Link* link = new google_apis::Link;
-    link->set_type(google_apis::Link::LINK_EMBED);
-    link->set_href(file_resource.embed_link());
-    links.push_back(link);
-  }
   entry->set_links(links.Pass());
 
   // entry->categories_
diff --git a/chrome/browser/drive/fake_drive_service.cc b/chrome/browser/drive/fake_drive_service.cc
index 25298b8..a698de4 100644
--- a/chrome/browser/drive/fake_drive_service.cc
+++ b/chrome/browser/drive/fake_drive_service.cc
@@ -1399,9 +1399,7 @@ const FakeDriveService::EntryInfo* FakeDriveService::AddNewEntry(
 
   std::string escaped_resource_id = net::EscapePath(resource_id);
 
-  // Set download URL and mime type.
-  new_file->set_download_url(
-      GURL("https://xxx/content/" + escaped_resource_id));
+  // Set mime type.
   new_file->set_mime_type(content_type);
 
   // Set parents.
@@ -1416,8 +1414,6 @@ const FakeDriveService::EntryInfo* FakeDriveService::AddNewEntry(
   parents.push_back(parent.release());
   new_file->set_parents(parents.Pass());
 
-  new_file->set_self_link(GURL("https://xxx/edit/" + escaped_resource_id));
-
   new_entry->share_url = net::AppendOrReplaceQueryParameter(
       share_url_base_, "name", title);
 
diff --git a/google_apis/drive/drive_api_parser.cc b/google_apis/drive/drive_api_parser.cc
index 48fe312..018c37d 100644
--- a/google_apis/drive/drive_api_parser.cc
+++ b/google_apis/drive/drive_api_parser.cc
@@ -75,7 +75,6 @@ bool GetOpenWithLinksFromDictionaryValue(
 const char kKind[] = "kind";
 const char kId[] = "id";
 const char kETag[] = "etag";
-const char kSelfLink[] = "selfLink";
 const char kItems[] = "items";
 const char kLargestChangeId[] = "largestChangeId";
 
@@ -130,15 +129,11 @@ const char kModifiedDate[] = "modifiedDate";
 const char kModifiedByMeDate[] = "modifiedByMeDate";
 const char kLastViewedByMeDate[] = "lastViewedByMeDate";
 const char kSharedWithMeDate[] = "sharedWithMeDate";
-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 kOpenWithLinks[] = "openWithLinks";
 const char kLabels[] = "labels";
 const char kImageMediaMetadata[] = "imageMediaMetadata";
@@ -438,9 +433,6 @@ 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->RegisterNestedField(kLabels, &FileResource::labels_);
@@ -467,9 +459,6 @@ void FileResource::RegisterJSONConverter(
       &FileResource::shared_with_me_date_,
       &util::GetTimeFromString);
   converter->RegisterBoolField(kShared, &FileResource::shared_);
-  converter->RegisterCustomField<GURL>(kDownloadUrl,
-                                       &FileResource::download_url_,
-                                       GetGURLFromString);
   converter->RegisterStringField(kFileExtension,
                                  &FileResource::file_extension_);
   converter->RegisterStringField(kMd5Checksum, &FileResource::md5_checksum_);
@@ -479,17 +468,8 @@ void FileResource::RegisterJSONConverter(
   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);
   converter->RegisterCustomValueField<std::vector<OpenWithLink> >(
       kOpenWithLinks,
       &FileResource::open_with_links_,
diff --git a/google_apis/drive/drive_api_parser.h b/google_apis/drive/drive_api_parser.h
index 478c9b7..75f2792 100644
--- a/google_apis/drive/drive_api_parser.h
+++ b/google_apis/drive/drive_api_parser.h
@@ -499,9 +499,6 @@ class FileResource {
   // Returns ETag for this file.
   const std::string& etag() const { return etag_; }
 
-  // Returns the link to JSON of this file itself.
-  const GURL& self_link() const { return self_link_; }
-
   // Returns the title of this file.
   const std::string& title() const { return title_; }
 
@@ -538,10 +535,6 @@ class FileResource {
   // Returns the 'shared' attribute of the file.
   bool shared() const { return shared_; }
 
-  // Returns the short-lived download URL for the file.  This field exists
-  // only when the file content is stored in Drive.
-  const GURL& download_url() const { return download_url_; }
-
   // Returns the extension part of the filename.
   const std::string& file_extension() const { return file_extension_; }
 
@@ -555,20 +548,10 @@ class FileResource {
   // E.g. Google Document, Google Spreadsheet.
   const GURL& alternate_link() const { return alternate_link_; }
 
-  // Returns the link for embedding the file.
-  const GURL& embed_link() const { return embed_link_; }
-
   // Returns parent references (directories) of this file.
   const ScopedVector<ParentReference>& parents() const { return parents_; }
   ScopedVector<ParentReference>* mutable_parents() { return &parents_; }
 
-  // Returns the link to the file's thumbnail.
-  const GURL& thumbnail_link() const { return thumbnail_link_; }
-
-  // Returns the link to open its downloadable content, using cookie based
-  // authentication.
-  const GURL& web_content_link() const { return web_content_link_; }
-
   // Returns the list of links to open the resource with a web app.
   const std::vector<OpenWithLink>& open_with_links() const {
     return open_with_links_;
@@ -580,9 +563,6 @@ class FileResource {
   void set_etag(const std::string& etag) {
     etag_ = etag;
   }
-  void set_self_link(const GURL& self_link) {
-    self_link_ = self_link;
-  }
   void set_title(const std::string& title) {
     title_ = title;
   }
@@ -613,9 +593,6 @@ class FileResource {
   void set_shared(bool shared) {
     shared_ = shared;
   }
-  void set_download_url(const GURL& download_url) {
-    download_url_ = download_url;
-  }
   void set_file_extension(const std::string& file_extension) {
     file_extension_ = file_extension;
   }
@@ -628,18 +605,9 @@ class FileResource {
   void set_alternate_link(const GURL& alternate_link) {
     alternate_link_ = alternate_link;
   }
-  void set_embed_link(const GURL& embed_link) {
-    embed_link_ = embed_link;
-  }
   void set_parents(ScopedVector<ParentReference> parents) {
     parents_ = parents.Pass();
   }
-  void set_thumbnail_link(const GURL& thumbnail_link) {
-    thumbnail_link_ = thumbnail_link;
-  }
-  void set_web_content_link(const GURL& web_content_link) {
-    web_content_link_ = web_content_link;
-  }
 
  private:
   friend class base::internal::RepeatedMessageConverter<FileResource>;
@@ -652,7 +620,6 @@ class FileResource {
 
   std::string file_id_;
   std::string etag_;
-  GURL self_link_;
   std::string title_;
   std::string mime_type_;
   FileLabels labels_;
@@ -663,15 +630,11 @@ class FileResource {
   base::Time last_viewed_by_me_date_;
   base::Time shared_with_me_date_;
   bool shared_;
-  GURL download_url_;
   std::string file_extension_;
   std::string md5_checksum_;
   int64 file_size_;
   GURL alternate_link_;
-  GURL embed_link_;
   ScopedVector<ParentReference> parents_;
-  GURL thumbnail_link_;
-  GURL web_content_link_;
   std::vector<OpenWithLink> open_with_links_;
 
   DISALLOW_COPY_AND_ASSIGN(FileResource);
diff --git a/google_apis/drive/drive_api_parser_unittest.cc b/google_apis/drive/drive_api_parser_unittest.cc
index 911ae6f..413e7ef 100644
--- a/google_apis/drive/drive_api_parser_unittest.cc
+++ b/google_apis/drive/drive_api_parser_unittest.cc
@@ -175,20 +175,13 @@ TEST(DriveAPIParserTest, FileListParser) {
             file1.parents()[0]->parent_link());
   EXPECT_FALSE(file1.parents()[0]->is_root());
 
-  EXPECT_EQ(GURL("https://www.example.com/download"), file1.download_url());
   EXPECT_EQ("ext", file1.file_extension());
   EXPECT_EQ("d41d8cd98f00b204e9800998ecf8427e", file1.md5_checksum());
   EXPECT_EQ(1000U, file1.file_size());
 
-  EXPECT_EQ(GURL("https://www.googleapis.com/drive/v2/files/"
-                 "0B4v7G8yEYAWHUmRrU2lMS2hLABC"),
-            file1.self_link());
   EXPECT_EQ(GURL("https://docs.google.com/file/d/"
                  "0B4v7G8yEYAWHUmRrU2lMS2hLABC/edit"),
             file1.alternate_link());
-  EXPECT_EQ(GURL("https://docs.google.com/uc?"
-                 "id=0B4v7G8yEYAWHUmRrU2lMS2hLABC&export=download"),
-            file1.web_content_link());
   ASSERT_EQ(1U, file1.open_with_links().size());
   EXPECT_EQ("1234567890", file1.open_with_links()[0].app_id);
   EXPECT_EQ(GURL("http://open_with_link/url"),
@@ -219,13 +212,6 @@ TEST(DriveAPIParserTest, FileListParser) {
 
   ASSERT_EQ(0U, file2.parents().size());
 
-  EXPECT_EQ(GURL("https://docs.google.com/a/chromium.org/document/d/"
-                 "1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC/preview"),
-            file2.embed_link());
-  EXPECT_EQ(GURL("https://docs.google.com/feeds/vt?gd=true&"
-                 "id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&"
-                 "v=3&s=AMedNnoAAAAAUBJyB0g8HbxZaLRnlztxefZPS24LiXYZ&sz=s220"),
-            file2.thumbnail_link());
   EXPECT_EQ(0U, file2.open_with_links().size());
 
   // Check file 3 (a folder)