Remove code parsing XML from gdata_wapi_parser.cc.

All responses from Drive API are in JSON, so we do not need support for parsing XML anymore.

BUG=165582

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

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

6 files changed, 78 insertions, 288 deletions

diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc
index b9fefda..5530fcc 100644
--- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc
@@ -37,23 +37,42 @@ TEST(ResourceEntryConversionTest, ConvertResourceEntryToDriveEntryProto_File) {
   EXPECT_FALSE(entry_proto.deleted());
   EXPECT_EQ(google_apis::ENTRY_KIND_FILE, entry_proto.kind());
 
-  // 2011-12-14T00:40:47.330Z
-  base::Time::Exploded exploded;
-  exploded.year = 2011;
-  exploded.month = 12;
-  exploded.day_of_month = 14;
-  exploded.day_of_week = 3;  // Wednesday
-  exploded.hour = 0;
-  exploded.minute = 40;
-  exploded.second = 47;
-  exploded.millisecond = 330;
-
-  const base::Time expected_time = base::Time::FromUTCExploded(exploded);
-  EXPECT_EQ(expected_time.ToInternalValue(),
+  base::Time expected_creation_time;
+  base::Time expected_modified_time;
+
+  {
+    // 2011-12-14T00:40:47.330Z
+    base::Time::Exploded exploded;
+    exploded.year = 2011;
+    exploded.month = 12;
+    exploded.day_of_month = 13;
+    exploded.day_of_week = 2;  // Tuesday
+    exploded.hour = 0;
+    exploded.minute = 40;
+    exploded.second = 47;
+    exploded.millisecond = 330;
+    expected_creation_time = base::Time::FromUTCExploded(exploded);
+  }
+
+  {
+    // 2011-12-13T00:40:47.330Z
+    base::Time::Exploded exploded;
+    exploded.year = 2011;
+    exploded.month = 12;
+    exploded.day_of_month = 14;
+    exploded.day_of_week = 3;  // Wednesday
+    exploded.hour = 0;
+    exploded.minute = 40;
+    exploded.second = 47;
+    exploded.millisecond = 330;
+    expected_modified_time = base::Time::FromUTCExploded(exploded);
+  }
+
+  EXPECT_EQ(expected_modified_time.ToInternalValue(),
             entry_proto.file_info().last_modified());
   // Last accessed value equal to 0 means that the file has never been viewed.
   EXPECT_EQ(0, entry_proto.file_info().last_accessed());
-  EXPECT_EQ(expected_time.ToInternalValue(),
+  EXPECT_EQ(expected_creation_time.ToInternalValue(),
             entry_proto.file_info().creation_time());
 
   EXPECT_EQ("audio/mpeg",
diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc
index 4c386ca..30d47f8 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser.cc
@@ -17,7 +17,6 @@
 #include "base/values.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/time_util.h"
-#include "third_party/libxml/chromium/libxml_utils.h"
 
 using base::Value;
 using base::DictionaryValue;
@@ -277,33 +276,6 @@ void Author::RegisterJSONConverter(
   converter->RegisterStringField(kEmailField, &Author::email_);
 }
 
-Author* Author::CreateFromXml(XmlReader* xml_reader) {
-  if (xml_reader->NodeName() != kAuthorNode)
-    return NULL;
-
-  if (!xml_reader->Read())
-    return NULL;
-
-  const int depth = xml_reader->Depth();
-  Author* author = new Author();
-  bool skip_read = false;
-  do {
-    skip_read = false;
-    DVLOG(1) << "Parsing author node " << xml_reader->NodeName()
-            << ", depth = " << depth;
-    if (xml_reader->NodeName() == kNameNode) {
-     std::string name;
-     if (xml_reader->ReadElementContent(&name))
-       author->name_ = UTF8ToUTF16(name);
-     skip_read = true;
-    } else if (xml_reader->NodeName() == kEmailNode) {
-     xml_reader->ReadElementContent(&author->email_);
-     skip_read = true;
-    }
-  } while (depth == xml_reader->Depth() && (skip_read || xml_reader->Next()));
-  return author;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Link implementation
 
@@ -373,28 +345,6 @@ void Link::RegisterJSONConverter(base::JSONValueConverter<Link>* converter) {
   converter->RegisterStringField(kTypeField, &Link::mime_type_);
 }
 
-// static.
-Link* Link::CreateFromXml(XmlReader* xml_reader) {
-  if (xml_reader->NodeName() != kLinkNode)
-    return NULL;
-
-  Link* link = new Link();
-  xml_reader->NodeAttribute(kTypeAttr, &link->mime_type_);
-
-  std::string href;
-  if (xml_reader->NodeAttribute(kHrefAttr, &href))
-      link->href_ = GURL(href);
-
-  std::string rel;
-  if (xml_reader->NodeAttribute(kRelAttr, &rel)) {
-    GetLinkType(rel, &link->type_);
-    if (link->type_ == LINK_OPEN_WITH)
-      GetAppID(rel, &link->app_id_);
-  }
-
-  return link;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // FeedLink implementation
 
@@ -423,23 +373,6 @@ void FeedLink::RegisterJSONConverter(
       kHrefField, &FeedLink::href_, &GetGURLFromString);
 }
 
-// static
-FeedLink* FeedLink::CreateFromXml(XmlReader* xml_reader) {
-  if (xml_reader->NodeName() != kFeedLinkNode)
-    return NULL;
-
-  FeedLink* link = new FeedLink();
-  std::string href;
-  if (xml_reader->NodeAttribute(kHrefAttr, &href))
-    link->href_ = GURL(href);
-
-  std::string rel;
-  if (xml_reader->NodeAttribute(kRelAttr, &rel))
-    GetFeedLinkType(rel, &link->type_);
-
-  return link;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Category implementation
 
@@ -468,25 +401,6 @@ void Category::RegisterJSONConverter(
   converter->RegisterStringField(kTermField, &Category::term_);
 }
 
-// static
-Category* Category::CreateFromXml(XmlReader* xml_reader) {
-  if (xml_reader->NodeName() != kCategoryNode)
-    return NULL;
-
-  Category* category = new Category();
-  xml_reader->NodeAttribute(kTermAttr, &category->term_);
-
-  std::string scheme;
-  if (xml_reader->NodeAttribute(kSchemeAttr, &scheme))
-    GetCategoryTypeFromScheme(scheme, &category->type_);
-
-  std::string label;
-  if (xml_reader->NodeAttribute(kLabelAttr, &label))
-    category->label_ = UTF8ToUTF16(label);
-
-  return category;
-}
-
 const Link* FeedEntry::GetLinkByType(Link::LinkType type) const {
   for (size_t i = 0; i < links_.size(); ++i) {
     if (links_[i]->type() == type)
@@ -508,20 +422,6 @@ void Content::RegisterJSONConverter(
   converter->RegisterStringField(kTypeField, &Content::mime_type_);
 }
 
-Content* Content::CreateFromXml(XmlReader* xml_reader) {
-  if (xml_reader->NodeName() != kContentNode)
-    return NULL;
-
-  Content* content = new Content();
-  std::string src;
-  if (xml_reader->NodeAttribute(kSrcAttr, &src))
-    content->url_ = GURL(src);
-
-  xml_reader->NodeAttribute(kTypeAttr, &content->mime_type_);
-  return content;
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // AppIcon implementation
 
@@ -791,97 +691,6 @@ scoped_ptr<ResourceEntry> ResourceEntry::CreateFrom(const base::Value& value) {
   return entry.Pass();
 }
 
-// static.
-scoped_ptr<ResourceEntry> ResourceEntry::CreateFromXml(XmlReader* xml_reader) {
-  if (xml_reader->NodeName() != kEntryNode)
-    return scoped_ptr<ResourceEntry>();
-
-  scoped_ptr<ResourceEntry> entry(new ResourceEntry);
-  xml_reader->NodeAttribute(kETagAttr, &entry->etag_);
-
-  if (!xml_reader->Read())
-    return entry.Pass();
-
-  bool skip_read = false;
-  do {
-    DVLOG(1) << "Parsing node " << xml_reader->NodeName();
-    skip_read = false;
-
-    if (xml_reader->NodeName() == kAuthorNode) {
-      scoped_ptr<Author> author(Author::CreateFromXml(xml_reader));
-      if (author.get())
-        entry->authors_.push_back(author.release());
-    }
-
-    if (xml_reader->NodeName() == kContentNode) {
-      scoped_ptr<Content> content(Content::CreateFromXml(xml_reader));
-      if (content.get())
-        entry->content_ = *content.get();
-    } else if (xml_reader->NodeName() == kLinkNode) {
-      scoped_ptr<Link> link(Link::CreateFromXml(xml_reader));
-      if (link.get())
-        entry->links_.push_back(link.release());
-    } else if (xml_reader->NodeName() == kFeedLinkNode) {
-      scoped_ptr<FeedLink> link(FeedLink::CreateFromXml(xml_reader));
-      if (link.get())
-        entry->feed_links_.push_back(link.release());
-    } else if (xml_reader->NodeName() == kCategoryNode) {
-      scoped_ptr<Category> category(Category::CreateFromXml(xml_reader));
-      if (category.get())
-        entry->categories_.push_back(category.release());
-    } else if (xml_reader->NodeName() == kUpdatedNode) {
-      std::string time;
-      if (xml_reader->ReadElementContent(&time))
-        util::GetTimeFromString(time, &entry->updated_time_);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kPublishedNode) {
-      std::string time;
-      if (xml_reader->ReadElementContent(&time))
-        util::GetTimeFromString(time, &entry->published_time_);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kIDNode) {
-      xml_reader->ReadElementContent(&entry->id_);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kResourceIdNode) {
-      xml_reader->ReadElementContent(&entry->resource_id_);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kTitleNode) {
-      std::string title;
-      if (xml_reader->ReadElementContent(&title))
-        entry->title_ = UTF8ToUTF16(title);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kFilenameNode) {
-      std::string file_name;
-      if (xml_reader->ReadElementContent(&file_name))
-        entry->filename_ = UTF8ToUTF16(file_name);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kSuggestedFilenameNode) {
-      std::string suggested_filename;
-      if (xml_reader->ReadElementContent(&suggested_filename))
-        entry->suggested_filename_ = UTF8ToUTF16(suggested_filename);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kMd5ChecksumNode) {
-      xml_reader->ReadElementContent(&entry->file_md5_);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kSizeNode) {
-      std::string size;
-      if (xml_reader->ReadElementContent(&size))
-        base::StringToInt64(size, &entry->file_size_);
-      skip_read = true;
-    } else if (xml_reader->NodeName() == kLastViewedNode) {
-      std::string time;
-      if (xml_reader->ReadElementContent(&time))
-        util::GetTimeFromString(time, &entry->last_viewed_time_);
-      skip_read = true;
-    } else {
-      DVLOG(1) << "Unknown node " << xml_reader->NodeName();
-    }
-  } while (skip_read || xml_reader->Next());
-
-  entry->FillRemainingFields();
-  return entry.Pass();
-}
-
 // static
 scoped_ptr<ResourceEntry> ResourceEntry::CreateFromFileResource(
     const FileResource& file) {
diff --git a/chrome/browser/google_apis/gdata_wapi_parser.h b/chrome/browser/google_apis/gdata_wapi_parser.h
index ad433d8c..7a59b5f 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser.h
+++ b/chrome/browser/google_apis/gdata_wapi_parser.h
@@ -19,7 +19,6 @@
 
 class FilePath;
 class Profile;
-class XmlReader;
 
 namespace base {
 class Value;
@@ -80,9 +79,6 @@ class Link {
   // this class.
   static void RegisterJSONConverter(base::JSONValueConverter<Link>* converter);
 
-  // Creates a link entry from parsed XML.
-  static Link* CreateFromXml(XmlReader* xml_reader);
-
   // Type of the link.
   LinkType type() const { return type_; }
 
@@ -142,8 +138,6 @@ class FeedLink {
   static void RegisterJSONConverter(
       base::JSONValueConverter<FeedLink>* converter);
 
-  static FeedLink* CreateFromXml(XmlReader* xml_reader);
-
   // MIME type of the feed.
   FeedLinkType type() const { return type_; }
 
@@ -177,8 +171,6 @@ class Author {
   static void RegisterJSONConverter(
       base::JSONValueConverter<Author>* converter);
 
-  static Author* CreateFromXml(XmlReader* xml_reader);
-
   // Getters.
   const string16& name() const { return name_; }
   const std::string& email() const { return email_; }
@@ -212,8 +204,6 @@ class Category {
   static void RegisterJSONConverter(
       base::JSONValueConverter<Category>* converter);
 
-  static Category* CreateFromXml(XmlReader* xml_reader);
-
   // Category label.
   const string16& label() const { return label_; }
 
@@ -253,8 +243,6 @@ class Content {
   static void RegisterJSONConverter(
       base::JSONValueConverter<Content>* converter);
 
-  static Content* CreateFromXml(XmlReader* xml_reader);
-
   const GURL& url() const { return url_; }
   const std::string& mime_type() const { return mime_type_; }
 
@@ -403,9 +391,6 @@ class ResourceEntry : public FeedEntry {
   // FillRemainingFields comment and implementation for the details.
   static scoped_ptr<ResourceEntry> CreateFrom(const base::Value& value);
 
-  // Creates resource entry from parsed XML.
-  static scoped_ptr<ResourceEntry> CreateFromXml(XmlReader* xml_reader);
-
   // Creates resource entry from FileResource.
   // TODO(kochi): This should go away soon. http://crbug.com/142293
   static scoped_ptr<ResourceEntry> CreateFromFileResource(
diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
index b34f97e..0ac4245 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/google_apis/time_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libxml/chromium/libxml_utils.h"
 
 using base::Value;
 using base::DictionaryValue;
@@ -25,39 +24,10 @@ using base::ListValue;
 
 namespace google_apis {
 
-class GDataWAPIParserTest : public testing::Test {
- protected:
-  static ResourceEntry* LoadResourceEntryFromXml(const std::string& filename) {
-    FilePath path;
-    std::string error;
-    PathService::Get(chrome::DIR_TEST_DATA, &path);
-    path = path.AppendASCII("chromeos")
-        .AppendASCII("gdata")
-        .AppendASCII(filename.c_str());
-    EXPECT_TRUE(file_util::PathExists(path)) <<
-        "Couldn't find " << path.value();
-    std::string contents;
-    EXPECT_TRUE(file_util::ReadFileToString(path, &contents));
-    XmlReader reader;
-    if (!reader.Load(contents)) {
-      NOTREACHED() << "Invalid xml:\n" << contents;
-      return NULL;
-    }
-    scoped_ptr<ResourceEntry> entry;
-    while (reader.Read()) {
-      if (reader.NodeName() == "entry") {
-        entry = ResourceEntry::CreateFromXml(&reader);
-        break;
-      }
-    }
-    return entry.release();
-  }
-};
-
 // TODO(nhiroki): Move json files to out of 'chromeos' directory
 // (http://crbug.com/149788).
 // Test document feed parsing.
-TEST_F(GDataWAPIParserTest, ResourceListJsonParser) {
+TEST(GDataWAPIParserTest, ResourceListJsonParser) {
   std::string error;
   scoped_ptr<Value> document =
       test_util::LoadJSONFile("gdata/basic_feed.json");
@@ -86,7 +56,6 @@ TEST_F(GDataWAPIParserTest, ResourceListJsonParser) {
   EXPECT_EQ("https://self_link/", self_link->href().spec());
   EXPECT_EQ("application/atom+xml", self_link->mime_type());
 
-
   const Link* resumable_link =
       feed->GetLinkByType(Link::LINK_RESUMABLE_CREATE_MEDIA);
   ASSERT_TRUE(resumable_link);
@@ -188,60 +157,61 @@ TEST_F(GDataWAPIParserTest, ResourceListJsonParser) {
 
 
 // Test document feed parsing.
-TEST_F(GDataWAPIParserTest, ResourceEntryXmlParser) {
-  scoped_ptr<ResourceEntry> entry(LoadResourceEntryFromXml("entry.xml"));
+TEST(GDataWAPIParserTest, ResourceEntryJsonParser) {
+  std::string error;
+  scoped_ptr<Value> document =
+      test_util::LoadJSONFile("gdata/file_entry.json");
+  ASSERT_TRUE(document.get());
+  ASSERT_EQ(Value::TYPE_DICTIONARY, document->GetType());
+  scoped_ptr<ResourceEntry> entry(ResourceEntry::ExtractAndParse(*document));
   ASSERT_TRUE(entry.get());
 
   EXPECT_EQ(ENTRY_KIND_FILE, entry->kind());
-  EXPECT_EQ("\"HhMOFgcNHSt7ImBr\"", entry->etag());
-  EXPECT_EQ("file:xml_file_resource_id", entry->resource_id());
-  EXPECT_EQ("https://xml_file_id", entry->id());
-  EXPECT_EQ(ASCIIToUTF16("Xml Entry File Title.tar"), entry->title());
+  EXPECT_EQ("\"HhMOFgxXHit7ImBr\"", entry->etag());
+  EXPECT_EQ("file:2_file_resource_id", entry->resource_id());
+  EXPECT_EQ("2_file_id", entry->id());
+  EXPECT_EQ(ASCIIToUTF16("File 1.mp3"), entry->title());
   base::Time entry1_update_time;
   base::Time entry1_publish_time;
-  ASSERT_TRUE(util::GetTimeFromString("2011-04-01T18:34:08.234Z",
-                                                   &entry1_update_time));
-  ASSERT_TRUE(util::GetTimeFromString("2010-11-07T05:03:54.719Z",
-                                                   &entry1_publish_time));
+  ASSERT_TRUE(util::GetTimeFromString("2011-12-14T00:40:47.330Z",
+                                      &entry1_update_time));
+  ASSERT_TRUE(util::GetTimeFromString("2011-12-13T00:40:47.330Z",
+                                      &entry1_publish_time));
   EXPECT_EQ(entry1_update_time, entry->updated_time());
   EXPECT_EQ(entry1_publish_time, entry->published_time());
 
   EXPECT_EQ(1U, entry->authors().size());
-  EXPECT_EQ(ASCIIToUTF16("entry_tester"), entry->authors()[0]->name());
-  EXPECT_EQ("entry_tester@testing.com", entry->authors()[0]->email());
-  EXPECT_EQ("https://1_xml_file_entry_content_url/",
+  EXPECT_EQ(ASCIIToUTF16("tester"), entry->authors()[0]->name());
+  EXPECT_EQ("tester@testing.com", entry->authors()[0]->email());
+  EXPECT_EQ("https://file_content_url/",
             entry->content_url().spec());
-  EXPECT_EQ("application/x-tar",
+  EXPECT_EQ("audio/mpeg",
             entry->content_mime_type());
 
   // Check feed links.
-  ASSERT_EQ(2U, entry->feed_links().size());
+  ASSERT_EQ(1U, entry->feed_links().size());
   const FeedLink* feed_link_1 = entry->feed_links()[0];
   ASSERT_TRUE(feed_link_1);
-  EXPECT_EQ(FeedLink::FEED_LINK_ACL, feed_link_1->type());
-
-  const FeedLink* feed_link_2 = entry->feed_links()[1];
-  ASSERT_TRUE(feed_link_2);
-  EXPECT_EQ(FeedLink::FEED_LINK_REVISIONS, feed_link_2->type());
+  EXPECT_EQ(FeedLink::FEED_LINK_REVISIONS, feed_link_1->type());
 
   // Check links.
-  ASSERT_EQ(9U, entry->links().size());
+  ASSERT_EQ(8U, entry->links().size());
   const Link* entry1_alternate_link =
       entry->GetLinkByType(Link::LINK_ALTERNATE);
   ASSERT_TRUE(entry1_alternate_link);
-  EXPECT_EQ("https://xml_file_entry_id_alternate_link/",
+  EXPECT_EQ("https://file_link_alternate/",
             entry1_alternate_link->href().spec());
   EXPECT_EQ("text/html", entry1_alternate_link->mime_type());
 
   const Link* entry1_edit_link = entry->GetLinkByType(Link::LINK_EDIT_MEDIA);
   ASSERT_TRUE(entry1_edit_link);
-  EXPECT_EQ("https://xml_file_entry_id_edit_media_link/",
+  EXPECT_EQ("https://file_edit_media/",
             entry1_edit_link->href().spec());
-  EXPECT_EQ("application/x-tar", entry1_edit_link->mime_type());
+  EXPECT_EQ("audio/mpeg", entry1_edit_link->mime_type());
 
   const Link* entry1_self_link = entry->GetLinkByType(Link::LINK_SELF);
   ASSERT_TRUE(entry1_self_link);
-  EXPECT_EQ("https://xml_file_entry_id_self_link/",
+  EXPECT_EQ("https://file1_link_self/file:2_file_resource_id",
             entry1_self_link->href().spec());
   EXPECT_EQ("application/atom+xml", entry1_self_link->mime_type());
   EXPECT_EQ("", entry1_self_link->app_id());
@@ -249,28 +219,28 @@ TEST_F(GDataWAPIParserTest, ResourceEntryXmlParser) {
   const Link* entry1_open_with_link =
       entry->GetLinkByType(Link::LINK_OPEN_WITH);
   ASSERT_TRUE(entry1_open_with_link);
-  EXPECT_EQ("https://xml_file_entry_open_with_link/",
+  EXPECT_EQ("https://entry1_open_with_link/",
             entry1_open_with_link->href().spec());
   EXPECT_EQ("application/atom+xml", entry1_open_with_link->mime_type());
   EXPECT_EQ("the_app_id", entry1_open_with_link->app_id());
 
   const Link* entry1_unknown_link = entry->GetLinkByType(Link::LINK_UNKNOWN);
   ASSERT_TRUE(entry1_unknown_link);
-  EXPECT_EQ("https://xml_file_fake_entry_open_with_link/",
+  EXPECT_EQ("https://entry1_fake_entry_open_with_link/",
             entry1_unknown_link->href().spec());
   EXPECT_EQ("application/atom+xml", entry1_unknown_link->mime_type());
   EXPECT_EQ("", entry1_unknown_link->app_id());
 
   // Check a file properties.
   EXPECT_EQ(ENTRY_KIND_FILE, entry->kind());
-  EXPECT_EQ(ASCIIToUTF16("Xml Entry File Name.tar"), entry->filename());
-  EXPECT_EQ(ASCIIToUTF16("Xml Entry Suggested File Name.tar"),
+  EXPECT_EQ(ASCIIToUTF16("File 1.mp3"), entry->filename());
+  EXPECT_EQ(ASCIIToUTF16("File 1.mp3"),
             entry->suggested_filename());
-  EXPECT_EQ("e48f4d5c46a778de263e0e3f4b3d2a7d", entry->file_md5());
-  EXPECT_EQ(26562560, entry->file_size());
+  EXPECT_EQ("3b4382ebefec6e743578c76bbd0575ce", entry->file_md5());
+  EXPECT_EQ(892721, entry->file_size());
 }
 
-TEST_F(GDataWAPIParserTest, AccountMetadataFeedParser) {
+TEST(GDataWAPIParserTest, AccountMetadataFeedParser) {
   scoped_ptr<Value> document =
       test_util::LoadJSONFile("gdata/account_metadata.json");
   ASSERT_TRUE(document.get());
@@ -338,7 +308,7 @@ TEST_F(GDataWAPIParserTest, AccountMetadataFeedParser) {
 }
 
 // Test file extension checking in ResourceEntry::HasDocumentExtension().
-TEST_F(GDataWAPIParserTest, ResourceEntryHasDocumentExtension) {
+TEST(GDataWAPIParserTest, ResourceEntryHasDocumentExtension) {
   EXPECT_TRUE(ResourceEntry::HasHostedDocumentExtension(
       FilePath(FILE_PATH_LITERAL("Test.gdoc"))));
   EXPECT_TRUE(ResourceEntry::HasHostedDocumentExtension(
@@ -359,7 +329,7 @@ TEST_F(GDataWAPIParserTest, ResourceEntryHasDocumentExtension) {
       FilePath(FILE_PATH_LITERAL(""))));
 }
 
-TEST_F(GDataWAPIParserTest, ResourceEntryClassifyEntryKind) {
+TEST(GDataWAPIParserTest, ResourceEntryClassifyEntryKind) {
   EXPECT_EQ(ResourceEntry::KIND_OF_NONE,
             ResourceEntry::ClassifyEntryKind(ENTRY_KIND_UNKNOWN));
   EXPECT_EQ(ResourceEntry::KIND_OF_NONE,
diff --git a/chrome/test/data/chromeos/gdata/entry.xml b/chrome/test/data/chromeos/gdata/entry.xml
deleted file mode 100644
index 241d881..0000000
--- a/chrome/test/data/chromeos/gdata/entry.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><entry gd:etag="&quot;HhMOFgcNHSt7ImBr&quot;" xmlns="http://www.w3.org/2005/Atom" xmlns:batch="http://schemas.google.com/gdata/batch" xmlns:docs="http://schemas.google.com/docs/2007" xmlns:gd="http://schemas.google.com/g/2005"><id>https://xml_file_id</id><published>2010-11-07T05:03:54.719Z</published><updated>2011-04-01T18:34:08.234Z</updated><app:edited xmlns:app="http://www.w3.org/2007/app">2012-03-21T04:35:08.213Z</app:edited><category label="application/x-tar" scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/docs/2007#file"/><category label="modified-by-me" scheme="http://schemas.google.com/g/2005/labels" term="http://schemas.google.com/g/2005/labels#modified-by-me"/><title>Xml Entry File Title.tar</title><content src="https://1_xml_file_entry_content_url/" type="application/x-tar"/><link href="https://xml_file_entry_id_alternate_link/" rel="alternate" type="text/html"/><link href="https://xml_file_entry_id_resumable_edit_media_link/icon.png" rel="http://schemas.google.com/docs/2007#icon" type="image/png"/><link href="https://xml_file_entry_id_resumable_edit_media_link/" rel="http://schemas.google.com/g/2005#resumable-edit-media" type="application/atom+xml"/><link href="https://xml_file_entry_id_alt_edit_media_link/" rel="http://schemas.google.com/docs/2007#alt-edit-media" type="application/atom+xml"/><link href="https://xml_file_entry_id_self_link/" rel="self" type="application/atom+xml"/><link href="https://xml_file_entry_id_edit_link/" rel="edit" type="application/atom+xml"/><link href="https://xml_file_entry_id_edit_media_link/" rel="edit-media" type="application/x-tar"/><link href="https://xml_file_entry_open_with_link/" rel="http://schemas.google.com/docs/2007#open-with-the_app_id" type="application/atom+xml"/><link href="https://xml_file_fake_entry_open_with_link/" rel="http://schemas.google.com/docs/2007#oh-no-not-open-with-the_app_id" type="application/atom+xml"/><author><name>entry_tester</name><email>entry_tester@testing.com</email></author><gd:resourceId>file:xml_file_resource_id</gd:resourceId><docs:modifiedByMeDate>2012-03-21T04:35:08.207Z</docs:modifiedByMeDate><gd:lastModifiedBy><name>zelidrag</name><email>zelidrag@gmail.com</email></gd:lastModifiedBy><gd:quotaBytesUsed>26562560</gd:quotaBytesUsed><docs:writersCanInvite value="true"/><docs:md5Checksum>e48f4d5c46a778de263e0e3f4b3d2a7d</docs:md5Checksum><docs:filename>Xml Entry File Name.tar</docs:filename><docs:suggestedFilename>Xml Entry Suggested File Name.tar</docs:suggestedFilename><docs:size>26562560</docs:size><gd:feedLink href="https://docs.google.com/feeds/xml_file_entry_id/acl" rel="http://schemas.google.com/acl/2007#accessControlList"/><gd:feedLink href="https://docs.google.com/feeds/xml_file_entry_id/revisions" rel="http://schemas.google.com/docs/2007/revisions"/></entry>
diff --git a/chrome/test/data/chromeos/gdata/file_entry.json b/chrome/test/data/chromeos/gdata/file_entry.json
index 524856e..f9f1d95 100644
--- a/chrome/test/data/chromeos/gdata/file_entry.json
+++ b/chrome/test/data/chromeos/gdata/file_entry.json
@@ -83,9 +83,17 @@
          "href": "https://file_edit_media",
          "rel": "edit-media",
          "type": "audio/mpeg"
+      }, {
+         "href": "https://entry1_open_with_link/",
+         "rel": "http://schemas.google.com/docs/2007#open-with-the_app_id",
+         "type": "application/atom+xml"
+      },  {
+         "href": "https://entry1_fake_entry_open_with_link/",
+         "rel": "http://schemas.google.com/docs/2007#oh-no-not-open-with-the_app_id",
+         "type": "application/atom+xml"
       } ],
       "published": {
-         "$t": "2011-12-14T00:40:47.330Z"
+         "$t": "2011-12-13T00:40:47.330Z"
       },
       "title": {
          "$t": "File 1.mp3"