ResourceId and unit test cleanup.

chrome/test/data/chromeos/gdata/basic_feed.json

 {
    "encoding": "UTF-8",
    "feed": {
       "author": [ {
          "email": {
             "$t": "tester@testing.com"
          },
          "name": {
             "$t": "tester"
          }
@@ skipping 130 matching lines @@
                "$t": "tester@testing.com"
             },
             "name": {
                "$t": "tester"
             }
          },
          "gd$quotaBytesUsed": {
             "$t": "892721"
          },
          "gd$resourceId": {
-            "$t": "file:subdirectory_file_1_id"
+            "$t": "file:5_file_resource_id"
          },
          "id": {
             "$t": "2_file_id"
          },
          "link": [ {
             "href": "https://file_link_parent",
             "rel": "http://schemas.google.com/docs/2007#parent",
             "title": "Medical",
             "type": "application/atom+xml"
          }, {
@@ skipping 242 matching lines @@
       },
       "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",
       "xmlns$openSearch": "http://a9.com/-/spec/opensearch/1.1/"
    },
    "version": "1.0"
 }