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

3 files changed, 7 insertions, 40 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);