37 files changed, 18 insertions, 679 deletions
diff --git a/chrome/browser/google_apis/gdata_test_util.cc b/chrome/browser/google_apis/gdata_test_util.cc
index a084366..cf3de4f 100644
--- a/chrome/browser/google_apis/gdata_test_util.cc
+++ b/chrome/browser/google_apis/gdata_test_util.cc
@@ -41,7 +41,8 @@ FilePath GetTestFilePath(const std::string& relative_path) {
   FilePath path;
   std::string error;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
-  path = path.Append(FilePath::FromUTF8Unsafe(relative_path));
+  path = path.AppendASCII("chromeos")
+      .Append(FilePath::FromUTF8Unsafe(relative_path));
   EXPECT_TRUE(file_util::PathExists(path)) <<
       "Couldn't find " << path.value();
   return path;
diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
index e2420b6..c428eb1 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
@@ -28,8 +28,12 @@ namespace google_apis {
 class GDataWAPIParserTest : public testing::Test {
  protected:
   static DocumentEntry* LoadDocumentEntryFromXml(const std::string& filename) {
-    FilePath path = test_util::GetTestFilePath(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;
@@ -50,6 +54,9 @@ class GDataWAPIParserTest : public testing::Test {
   }
 };
 
+// TODO(nhiroki): Make it possible to run these tests on any platforms after
+// moving json files to out of 'chromeos' directory (http://crbug.com/149788).
+#if defined(OS_CHROMEOS)
 // Test document feed parsing.
 TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) {
   std::string error;
@@ -182,7 +189,7 @@ TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) {
 
 // Test document feed parsing.
 TEST_F(GDataWAPIParserTest, DocumentEntryXmlParser) {
-  scoped_ptr<DocumentEntry> entry(LoadDocumentEntryFromXml("gdata/entry.xml"));
+  scoped_ptr<DocumentEntry> entry(LoadDocumentEntryFromXml("entry.xml"));
   ASSERT_TRUE(entry.get());
 
   EXPECT_EQ(ENTRY_KIND_FILE, entry->kind());
@@ -329,6 +336,7 @@ TEST_F(GDataWAPIParserTest, AccountMetadataFeedParser) {
   EXPECT_EQ(1U, second_app->primary_extensions().size());
   EXPECT_EQ(0U, second_app->secondary_extensions().size());
 }
+#endif  // OS_CHROMEOS
 
 // Test file extension checking in DocumentEntry::HasDocumentExtension().
 TEST_F(GDataWAPIParserTest, DocumentEntryHasDocumentExtension) {
diff --git a/chrome/browser/google_apis/gdata_wapi_service_browsertest.cc b/chrome/browser/google_apis/gdata_wapi_service_browsertest.cc
index 973672b0..4c65e70 100644
--- a/chrome/browser/google_apis/gdata_wapi_service_browsertest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_service_browsertest.cc
@@ -81,14 +81,14 @@ IN_PROC_BROWSER_TEST_F(GDataTest, Download) {
       FilePath(FILE_PATH_LITERAL("/dummy/gdata/testfile.txt")),
       GetTestCachedFilePath(FilePath(
           FILE_PATH_LITERAL("cached_testfile.txt"))),
-      gdata_test_server_.GetURL("files/gdata/testfile.txt"),
+      gdata_test_server_.GetURL("files/chromeos/gdata/testfile.txt"),
       base::Bind(&TestDownloadCallback, &result, &contents),
       GetContentCallback());
   content::RunMessageLoop();
 
   EXPECT_EQ(HTTP_SUCCESS, result);
   FilePath expected_filepath = gdata_test_server_.document_root().Append(
-      FilePath(FILE_PATH_LITERAL("gdata/testfile.txt")));
+      FilePath(FILE_PATH_LITERAL("chromeos/gdata/testfile.txt")));
   std::string expected_contents;
   file_util::ReadFileToString(expected_filepath, &expected_contents);
   EXPECT_EQ(expected_contents, contents);
@@ -101,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, NonExistingDownload) {
       FilePath(FILE_PATH_LITERAL("/dummy/gdata/no-such-file.txt")),
       GetTestCachedFilePath(FilePath(
           FILE_PATH_LITERAL("cache_no-such-file.txt"))),
-      gdata_test_server_.GetURL("files/gdata/no-such-file.txt"),
+      gdata_test_server_.GetURL("files/chromeos/gdata/no-such-file.txt"),
       base::Bind(&TestDownloadCallback, &result, &dummy_contents),
       GetContentCallback());
   content::RunMessageLoop();
@@ -114,7 +114,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, GetDocuments) {
   GDataErrorCode result = GDATA_OTHER_ERROR;
   base::Value* result_data = NULL;
   service_->GetDocuments(
-      gdata_test_server_.GetURL("files/gdata/root_feed.json"),
+      gdata_test_server_.GetURL("files/chromeos/gdata/root_feed.json"),
       0,  // start_changestamp
       std::string(),  // search string
       std::string(),  // directory resource ID
@@ -124,7 +124,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, GetDocuments) {
   EXPECT_EQ(HTTP_SUCCESS, result);
   ASSERT_TRUE(result_data);
   FilePath expected_filepath = gdata_test_server_.document_root().Append(
-      FilePath(FILE_PATH_LITERAL("gdata/root_feed.json")));
+      FilePath(FILE_PATH_LITERAL("chromeos/gdata/root_feed.json")));
   std::string expected_contents;
   file_util::ReadFileToString(expected_filepath, &expected_contents);
   scoped_ptr<base::Value> expected_data(
@@ -139,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, GetDocumentsFailure) {
   GDataErrorCode result = GDATA_OTHER_ERROR;
   base::Value* result_data = NULL;
   service_->GetDocuments(
-      gdata_test_server_.GetURL("files/gdata/testfile.txt"),
+      gdata_test_server_.GetURL("files/chromeos/gdata/testfile.txt"),
       0,  // start_changestamp
       std::string(),  // search string
       std::string(),  // directory resource ID
diff --git a/chrome/test/data/gdata/account_metadata.json b/chrome/test/data/chromeos/gdata/account_metadata.json
index 1378edd..1378edd 100644
--- a/chrome/test/data/gdata/account_metadata.json
+++ b/chrome/test/data/chromeos/gdata/account_metadata.json
diff --git a/chrome/test/data/gdata/basic_feed.json b/chrome/test/data/chromeos/gdata/basic_feed.json
index dde5b56..dde5b56 100644
--- a/chrome/test/data/gdata/basic_feed.json
+++ b/chrome/test/data/chromeos/gdata/basic_feed.json
diff --git a/chrome/test/data/gdata/deleted_hosted_document_entry.json b/chrome/test/data/chromeos/gdata/deleted_hosted_document_entry.json
index 614b57d..614b57d 100644
--- a/chrome/test/data/gdata/deleted_hosted_document_entry.json
+++ b/chrome/test/data/chromeos/gdata/deleted_hosted_document_entry.json
diff --git a/chrome/test/data/gdata/delta_dir_moved_from_root_to_directory.json b/chrome/test/data/chromeos/gdata/delta_dir_moved_from_root_to_directory.json
index f9cacd7..f9cacd7 100644
--- a/chrome/test/data/gdata/delta_dir_moved_from_root_to_directory.json
+++ b/chrome/test/data/chromeos/gdata/delta_dir_moved_from_root_to_directory.json
diff --git a/chrome/test/data/gdata/delta_file_added_in_directory.json b/chrome/test/data/chromeos/gdata/delta_file_added_in_directory.json
index 7f2b926..7f2b926 100644
--- a/chrome/test/data/gdata/delta_file_added_in_directory.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_added_in_directory.json
diff --git a/chrome/test/data/gdata/delta_file_added_in_new_but_deleted_directory.json b/chrome/test/data/chromeos/gdata/delta_file_added_in_new_but_deleted_directory.json
index 31a5657..31a5657 100644
--- a/chrome/test/data/gdata/delta_file_added_in_new_but_deleted_directory.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_added_in_new_but_deleted_directory.json
diff --git a/chrome/test/data/gdata/delta_file_added_in_new_directory.json b/chrome/test/data/chromeos/gdata/delta_file_added_in_new_directory.json
index 86b6938e..86b6938e 100644
--- a/chrome/test/data/gdata/delta_file_added_in_new_directory.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_added_in_new_directory.json
diff --git a/chrome/test/data/gdata/delta_file_added_in_root.json b/chrome/test/data/chromeos/gdata/delta_file_added_in_root.json
index 0e4a04c..0e4a04c 100644
--- a/chrome/test/data/gdata/delta_file_added_in_root.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_added_in_root.json
diff --git a/chrome/test/data/gdata/delta_file_deleted_in_directory.json b/chrome/test/data/chromeos/gdata/delta_file_deleted_in_directory.json
index bca80c1..bca80c1 100644
--- a/chrome/test/data/gdata/delta_file_deleted_in_directory.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_deleted_in_directory.json
diff --git a/chrome/test/data/gdata/delta_file_deleted_in_root.json b/chrome/test/data/chromeos/gdata/delta_file_deleted_in_root.json
index 3120d05..3120d05 100644
--- a/chrome/test/data/gdata/delta_file_deleted_in_root.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_deleted_in_root.json
diff --git a/chrome/test/data/gdata/delta_file_moved_from_directory_to_root.json b/chrome/test/data/chromeos/gdata/delta_file_moved_from_directory_to_root.json
index f2ca808..f2ca808 100644
--- a/chrome/test/data/gdata/delta_file_moved_from_directory_to_root.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_moved_from_directory_to_root.json
diff --git a/chrome/test/data/gdata/delta_file_renamed_in_directory.json b/chrome/test/data/chromeos/gdata/delta_file_renamed_in_directory.json
index 75e1ed7..75e1ed7 100644
--- a/chrome/test/data/gdata/delta_file_renamed_in_directory.json
+++ b/chrome/test/data/chromeos/gdata/delta_file_renamed_in_directory.json
diff --git a/chrome/test/data/gdata/directory_entry.json b/chrome/test/data/chromeos/gdata/directory_entry.json
index 5af6a32..5af6a32 100644
--- a/chrome/test/data/gdata/directory_entry.json
+++ b/chrome/test/data/chromeos/gdata/directory_entry.json
diff --git a/chrome/test/data/gdata/directory_entry_atom.json b/chrome/test/data/chromeos/gdata/directory_entry_atom.json
index 1b1b2c6..1b1b2c6 100644
--- a/chrome/test/data/gdata/directory_entry_atom.json
+++ b/chrome/test/data/chromeos/gdata/directory_entry_atom.json
diff --git a/chrome/test/data/gdata/directory_entry_atom2.json b/chrome/test/data/chromeos/gdata/directory_entry_atom2.json
index 6f42afe..6f42afe 100644
--- a/chrome/test/data/gdata/directory_entry_atom2.json
+++ b/chrome/test/data/chromeos/gdata/directory_entry_atom2.json
diff --git a/chrome/test/data/gdata/document_to_download.json b/chrome/test/data/chromeos/gdata/document_to_download.json
index 074eb0a..074eb0a 100644
--- a/chrome/test/data/gdata/document_to_download.json
+++ b/chrome/test/data/chromeos/gdata/document_to_download.json
diff --git a/chrome/test/data/gdata/empty_feed.json b/chrome/test/data/chromeos/gdata/empty_feed.json
index b5d6446..b5d6446 100644
--- a/chrome/test/data/gdata/empty_feed.json
+++ b/chrome/test/data/chromeos/gdata/empty_feed.json
diff --git a/chrome/test/data/gdata/entry.xml b/chrome/test/data/chromeos/gdata/entry.xml
index 241d881..241d881 100644
--- a/chrome/test/data/gdata/entry.xml
+++ b/chrome/test/data/chromeos/gdata/entry.xml
diff --git a/chrome/test/data/gdata/file_entry.json b/chrome/test/data/chromeos/gdata/file_entry.json
index 524856e..524856e 100644
--- a/chrome/test/data/gdata/file_entry.json
+++ b/chrome/test/data/chromeos/gdata/file_entry.json
diff --git a/chrome/test/data/gdata/hosted_document_entry.json b/chrome/test/data/chromeos/gdata/hosted_document_entry.json
index 8d9a609..8d9a609 100644
--- a/chrome/test/data/gdata/hosted_document_entry.json
+++ b/chrome/test/data/chromeos/gdata/hosted_document_entry.json
diff --git a/chrome/test/data/gdata/new_folder_entry.json b/chrome/test/data/chromeos/gdata/new_folder_entry.json
index f8424d9..f8424d9 100644
--- a/chrome/test/data/gdata/new_folder_entry.json
+++ b/chrome/test/data/chromeos/gdata/new_folder_entry.json
diff --git a/chrome/test/data/gdata/remote_file_system_apitest_document_to_download.json b/chrome/test/data/chromeos/gdata/remote_file_system_apitest_document_to_download.json
index d1d4d9d..d1d4d9d 100644
--- a/chrome/test/data/gdata/remote_file_system_apitest_document_to_download.json
+++ b/chrome/test/data/chromeos/gdata/remote_file_system_apitest_document_to_download.json
diff --git a/chrome/test/data/gdata/remote_file_system_apitest_root_feed.json b/chrome/test/data/chromeos/gdata/remote_file_system_apitest_root_feed.json
index ccee7465..ccee7465 100644
--- a/chrome/test/data/gdata/remote_file_system_apitest_root_feed.json
+++ b/chrome/test/data/chromeos/gdata/remote_file_system_apitest_root_feed.json
diff --git a/chrome/test/data/gdata/root_feed.json b/chrome/test/data/chromeos/gdata/root_feed.json
index 6bb64f9..6bb64f9 100644
--- a/chrome/test/data/gdata/root_feed.json
+++ b/chrome/test/data/chromeos/gdata/root_feed.json
diff --git a/chrome/test/data/gdata/search_result_feed.json b/chrome/test/data/chromeos/gdata/search_result_feed.json
index 7d16451..7d16451 100644
--- a/chrome/test/data/gdata/search_result_feed.json
+++ b/chrome/test/data/chromeos/gdata/search_result_feed.json
diff --git a/chrome/test/data/gdata/search_result_with_new_entry_feed.json b/chrome/test/data/chromeos/gdata/search_result_with_new_entry_feed.json
index ae33ddd..ae33ddd 100644
--- a/chrome/test/data/gdata/search_result_with_new_entry_feed.json
+++ b/chrome/test/data/chromeos/gdata/search_result_with_new_entry_feed.json
diff --git a/chrome/test/data/gdata/subdir_feed.json b/chrome/test/data/chromeos/gdata/subdir_feed.json
index d5951fb..d5951fb 100644
--- a/chrome/test/data/gdata/subdir_feed.json
+++ b/chrome/test/data/chromeos/gdata/subdir_feed.json
diff --git a/chrome/test/data/gdata/testfile.txt b/chrome/test/data/chromeos/gdata/testfile.txt
index 7702bd8..7702bd8 100644
--- a/chrome/test/data/gdata/testfile.txt
+++ b/chrome/test/data/chromeos/gdata/testfile.txt
diff --git a/chrome/test/data/gdata/uploaded_document.json b/chrome/test/data/chromeos/gdata/uploaded_document.json
index 6775cc9..6775cc9 100644
--- a/chrome/test/data/gdata/uploaded_document.json
+++ b/chrome/test/data/chromeos/gdata/uploaded_document.json
diff --git a/chrome/test/data/gdata/uploaded_file.json b/chrome/test/data/chromeos/gdata/uploaded_file.json
index be2ee37..be2ee37 100644
--- a/chrome/test/data/gdata/uploaded_file.json
+++ b/chrome/test/data/chromeos/gdata/uploaded_file.json
diff --git a/chrome/test/data/drive/about.json b/chrome/test/data/drive/about.json
deleted file mode 100644
index c0f52ba..0000000
--- a/chrome/test/data/drive/about.json
+++ /dev/null
@@ -1,251 +0,0 @@
-{
- "kind": "drive#about",
- "etag": "\"ia2FSHMEjvcFQvtI43H5NSXKABC/2QujpLrTbaz3UJ2wpt1HSuAZXYZ\"",
- "selfLink": "https://www.googleapis.com/drive/v2/about",
- "name": "Test User",
- "quotaBytesTotal": "5368709120",
- "quotaBytesUsed": "1073741824",
- "quotaBytesUsedInTrash": "0",
- "largestChangeId": "8177",
- "rootFolderId": "0AIv7G8yEYAWHUk9123",
- "domainSharingPolicy": "allowedWithWarning",
- "permissionId": "12141426201712069789",
- "importFormats": [
-  {
-   "source": "application/msword",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "text/plain",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "text/tab-separated-values",
-   "targets": [
-    "application/vnd.google-apps.spreadsheet"
-   ]
-  },
-  {
-   "source": "application/vnd.ms-excel",
-   "targets": [
-    "application/vnd.google-apps.spreadsheet"
-   ]
-  },
-  {
-   "source": "application/vnd.sun.xml.writer",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "image/bmp",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "application/rtf",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "image/gif",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "text/csv",
-   "targets": [
-    "application/vnd.google-apps.spreadsheet"
-   ]
-  },
-  {
-   "source": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-   "targets": [
-    "application/vnd.google-apps.presentation"
-   ]
-  },
-  {
-   "source": "application/x-msmetafile",
-   "targets": [
-    "application/vnd.google-apps.drawing"
-   ]
-  },
-  {
-   "source": "application/vnd.oasis.opendocument.text",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-   "targets": [
-    "application/vnd.google-apps.spreadsheet"
-   ]
-  },
-  {
-   "source": "application/vnd.ms-powerpoint",
-   "targets": [
-    "application/vnd.google-apps.presentation"
-   ]
-  },
-  {
-   "source": "application/x-vnd.oasis.opendocument.spreadsheet",
-   "targets": [
-    "application/vnd.google-apps.spreadsheet"
-   ]
-  },
-  {
-   "source": "application/pdf",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "image/jpeg",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "image/png",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  },
-  {
-   "source": "text/html",
-   "targets": [
-    "application/vnd.google-apps.document"
-   ]
-  }
- ],
- "exportFormats": [
-  {
-   "source": "application/vnd.google-apps.form",
-   "targets": [
-    "application/pdf",
-    "application/x-vnd.oasis.opendocument.spreadsheet",
-    "application/vnd.ms-excel"
-   ]
-  },
-  {
-   "source": "application/vnd.google-apps.presentation",
-   "targets": [
-    "application/pdf",
-    "application/vnd.openxmlformats-officedocument.presentationml.presentation"
-   ]
-  },
-  {
-   "source": "application/vnd.google-apps.spreadsheet",
-   "targets": [
-    "application/pdf",
-    "application/x-vnd.oasis.opendocument.spreadsheet",
-    "application/vnd.ms-excel"
-   ]
-  },
-  {
-   "source": "application/vnd.google-apps.document",
-   "targets": [
-    "application/vnd.oasis.opendocument.text",
-    "application/msword",
-    "text/html",
-    "application/rtf",
-    "text/plain",
-    "application/pdf"
-   ]
-  },
-  {
-   "source": "application/vnd.google-apps.drawing",
-   "targets": [
-    "image/svg+xml",
-    "image/jpeg",
-    "image/png",
-    "application/pdf"
-   ]
-  }
- ],
- "additionalRoleInfo": [
-  {
-   "type": "application/vnd.google-apps.document",
-   "roleSets": [
-    {
-     "primaryRole": "reader",
-     "additionalRoles": [
-      "commenter"
-     ]
-    }
-   ]
-  },
-  {
-   "type": "application/vnd.google-apps.drawing",
-   "roleSets": [
-    {
-     "primaryRole": "reader",
-     "additionalRoles": [
-      "commenter"
-     ]
-    }
-   ]
-  },
-  {
-   "type": "application/vnd.google-apps.presentation",
-   "roleSets": [
-    {
-     "primaryRole": "reader",
-     "additionalRoles": [
-      "commenter"
-     ]
-    }
-   ]
-  }
- ],
- "features": [
-  {
-   "featureName": "ocr"
-  },
-  {
-   "featureName": "translation",
-   "featureRate": 2.0
-  }
- ],
- "maxUploadSizes": [
-  {
-   "type": "application/vnd.google-apps.drawing",
-   "size": "2097152"
-  },
-  {
-   "type": "*",
-   "size": "10737418240"
-  },
-  {
-   "type": "application/vnd.google-apps.presentation",
-   "size": "52428800"
-  },
-  {
-   "type": "application/vnd.google-apps.document",
-   "size": "2097152"
-  },
-  {
-   "type": "application/vnd.google-apps.spreadsheet",
-   "size": "20971520"
-  },
-  {
-   "type": "application/pdf",
-   "size": "10737418240"
-  }
- ],
- "isCurrentAppInstalled": false
-}
diff --git a/chrome/test/data/drive/applist.json b/chrome/test/data/drive/applist.json
deleted file mode 100644
index 5614b43..0000000
--- a/chrome/test/data/drive/applist.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "kind": "drive#appList",
- "etag": "\"Jm4BaSnCWNND-noZsHINRqj4ABC/tuqRBw0lvjUdPtc_2msA1tN4XYZ\"",
- "selfLink": "https://www.googleapis.com/drive/v2/apps",
- "items": [
-  {
-   "kind": "drive#app",
-   "id": "123456788192",
-   "name": "Drive app 1",
-   "objectType": "",
-   "supportsCreate": true,
-   "supportsImport": true,
-   "installed": true,
-   "authorized": false,
-   "productUrl": "https://chrome.google.com/webstore/detail/abcdefghabcdefghabcdefghabcdefgh",
-   "primaryMimeTypes": [
-    "application/vnd.google-apps.drive-sdk.123456788192"
-   ],
-   "secondaryMimeTypes": [
-    "text/html",
-    "text/plain"
-   ],
-   "primaryFileExtensions": [
-    "exe",
-    "com"
-   ],
-   "icons": [
-    {
-     "category": "application",
-     "size": 10,
-     "iconUrl": "http://www.example.com/10.png"
-    },
-    {
-     "category": "application",
-     "size": 16,
-     "iconUrl": "http://www.example.com/16.png"
-    },
-    {
-     "category": "document",
-     "size": 10,
-     "iconUrl": "http://www.example.com/d10.png"
-    },
-    {
-     "category": "document",
-     "size": 16,
-     "iconUrl": "http://www.example.com/d16.png"
-    },
-    {
-     "category": "documentShared",
-     "size": 10,
-     "iconUrl": "http://www.example.com/ds10.png"
-    },
-    {
-     "category": "documentShared",
-     "size": 16,
-     "iconUrl": "http://www.example.com/ds16.png"
-    }
-   ]
-  },
-  {
-   "kind": "drive#app",
-   "id": "876543210000",
-   "name": "Drive app 2",
-   "objectType": "",
-   "supportsCreate": false,
-   "supportsImport": false,
-   "installed": true,
-   "authorized": false,
-   "productUrl": "https://chrome.google.com/webstore/detail/hgfedcbahgfedcbahgfedcbahgfedcba",
-   "primaryMimeTypes": [
-    "image/jpeg",
-    "image/png",
-    "application/vnd.google-apps.drive-sdk.876543210000"
-   ],
-   "icons": [
-    {
-     "category": "application",
-     "size": 10,
-     "iconUrl": "http://www.example.com/10.png"
-    },
-    {
-     "category": "document",
-     "size": 10,
-     "iconUrl": "http://www.example.com/d10.png"
-    },
-    {
-     "category": "documentShared",
-     "size": 10,
-     "iconUrl": "http://www.example.com/ds10.png"
-    }
-   ]
-  }
- ]
-}
diff --git a/chrome/test/data/drive/changelist.json b/chrome/test/data/drive/changelist.json
deleted file mode 100644
index dd449f9..0000000
--- a/chrome/test/data/drive/changelist.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
- "kind": "drive#changeList",
- "etag": "\"Lp2bjAtLP341hvGmYHhxjYyBPJ8/BWbu_eylt5f_aGtCN6mGRv9hABC\"",
- "selfLink": "https://www.googleapis.com/drive/v2/changes",
- "nextPageToken": "8929",
- "nextLink": "https://www.googleapis.com/drive/v2/changes?pageToken=8929",
- "largestChangeId": "13664",
- "items": [
-  {
-   "kind": "drive#change",
-   "id": "8421",
-   "fileId": "1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC",
-   "selfLink": "https://www.googleapis.com/drive/v2/changes/8421",
-   "deleted": false,
-   "file": {
-    "kind": "drive#file",
-    "id": "1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC",
-    "etag": "\"Lp2bjAtLP341hvGmYHhxjYyBPJ8/MTM0MzM2NDg1MTAABC\"",
-    "selfLink": "https://www.googleapis.com/drive/v2/files/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC",
-    "alternateLink": "https://docs.google.com/a/chromium.org/document/d/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC/edit",
-    "embedLink": "https://docs.google.com/a/chromium.org/document/d/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC/preview",
-    "thumbnailLink": "https://docs.google.com/feeds/vt?gd=true&id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&v=3&s=AMedNnoAAAAAUBo617fje6DQnYkylcdbcGp8aXpFiXYZ&sz=s220",
-    "title": "Test Google Document",
-    "mimeType": "application/vnd.google-apps.document",
-    "labels": {
-     "starred": false,
-     "hidden": false,
-     "trashed": false,
-     "restricted": false,
-     "viewed": true
-    },
-    "createdDate": "2012-07-27T04:54:09.686Z",
-    "modifiedDate": "2012-07-27T04:54:11.030Z",
-    "modifiedByMeDate": "2012-07-27T04:54:11.030Z",
-    "lastViewedByMeDate": "2012-07-27T04:54:11.030Z",
-    "parents": [
-     {
-      "kind": "drive#parentReference",
-      "id": "0AIv7G8yEYAWHUk9ABC",
-      "selfLink": "https://www.googleapis.com/drive/v2/files/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC/parents/0AIv7G8yEYAWHUk9ABC",
-      "parentLink": "https://www.googleapis.com/drive/v2/files/0AIv7G8yEYAWHUk9ABC",
-      "isRoot": true
-     }
-    ],
-    "exportLinks": {
-     "application/msword": "https://docs.google.com/feeds/download/documents/export/Export?id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&exportFormat=doc",
-     "text/html": "https://docs.google.com/feeds/download/documents/export/Export?id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&exportFormat=html",
-     "application/pdf": "https://docs.google.com/feeds/download/documents/export/Export?id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&exportFormat=pdf"
-    },
-    "userPermission": {
-     "kind": "drive#permission",
-     "etag": "\"Lp2bjAtLP341hvGmYHhxjYyBPJ8/ufh4Gu_RoDI23a1Nr8tDm1yJXYZ\"",
-     "id": "me",
-     "selfLink": "https://www.googleapis.com/drive/v2/files/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC/permissions/me",
-     "role": "owner",
-     "type": "user"
-    },
-    "quotaBytesUsed": "0",
-    "ownerNames": [
-     "Test User"
-    ],
-    "lastModifyingUserName": "Test User",
-    "editable": true,
-    "writersCanShare": true
-   }
-  },
-  {
-   "kind": "drive#change",
-   "id": "8424",
-   "fileId": "0B4v7G8yEYAWHUmRrU2lMS2hLABC",
-   "selfLink": "https://www.googleapis.com/drive/v2/changes/8424",
-   "deleted": false,
-   "file": {
-    "kind": "drive#file",
-    "id": "0B4v7G8yEYAWHUmRrU2lMS2hLABC",
-    "etag": "\"Lp2bjAtLP341hvGmYHhxjYyBPJ8/MTM0MzM2NzgwMDIABC\"",
-    "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHUmRrU2lMS2hLABC",
-    "webContentLink": "https://docs.google.com/a/chromium.org/uc?id=0B4v7G8yEYAWHUmRrU2lMS2hLABC&export=download",
-    "alternateLink": "https://docs.google.com/a/chromium.org/file/d/0B4v7G8yEYAWHUmRrU2lMS2hLABC/edit",
-    "title": "My first file data",
-    "mimeType": "application/octet-stream",
-    "labels": {
-     "starred": false,
-     "hidden": false,
-     "trashed": false,
-     "restricted": false,
-     "viewed": true
-    },
-    "createdDate": "2012-07-24T08:51:16.570Z",
-    "modifiedDate": "2012-07-27T05:43:20.269Z",
-    "modifiedByMeDate": "2012-07-27T05:43:20.269Z",
-    "lastViewedByMeDate": "2012-07-27T05:43:20.269Z",
-    "parents": [
-     {
-      "kind": "drive#parentReference",
-      "id": "0AIv7G8yEYAWHUk9ABC",
-      "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHUmRrU2lMS2hLABC/parents/0AIv7G8yEYAWHUk9ABC",
-      "parentLink": "https://www.googleapis.com/drive/v2/files/0AIv7G8yEYAWHUk9ABC",
-      "isRoot": true
-     }
-    ],
-    "downloadUrl": "https://www.example.com/download",
-    "userPermission": {
-     "kind": "drive#permission",
-     "etag": "\"Lp2bjAtLP341hvGmYHhxjYyBPJ8/TZY6eNr9QBUIWHY-czo93820XYZ\"",
-     "id": "me",
-     "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHUmRrU2lMS2hLABC/permissions/me",
-     "role": "owner",
-     "type": "user"
-    },
-    "originalFilename": "Untitled Document.ext",
-    "fileExtension": "ext",
-    "md5Checksum": "d41d8cd98f00b204e9800998ecf8427e",
-    "fileSize": "1000",
-    "quotaBytesUsed": "1000",
-    "ownerNames": [
-     "Test User"
-    ],
-    "lastModifyingUserName": "Takayoshi Kochi",
-    "editable": true,
-    "writersCanShare": true
-   }
-  },
-  {
-   "kind": "drive#change",
-   "id": "8429",
-   "fileId": "0B4v7G8yEYAWHYW1OcExsUVZLABC",
-   "selfLink": "https://www.googleapis.com/drive/v2/changes/8429",
-   "deleted": false,
-   "file": {
-    "kind": "drive#file",
-    "id": "0B4v7G8yEYAWHYW1OcExsUVZLABC",
-    "etag": "\"Lp2bjAtLP341hvGmYHhxjYyBPJ8/MTM0MzM2NDE5ODUABC\"",
-    "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHYW1OcExsUVZLABC",
-    "alternateLink": "https://docs.google.com/a/chromium.org/folder/d/0B4v7G8yEYAWHYW1OcExsUVZLABC/edit",
-    "title": "TestFolder",
-    "mimeType": "application/vnd.google-apps.folder",
-    "labels": {
-     "starred": false,
-     "hidden": false,
-     "trashed": false,
-     "restricted": false,
-     "viewed": true
-    },
-    "createdDate": "2012-07-02T09:53:18.422Z",
-    "modifiedDate": "2012-07-27T04:43:18.507Z",
-    "modifiedByMeDate": "2012-07-27T04:43:18.507Z",
-    "lastViewedByMeDate": "2012-07-27T04:40:52.371Z",
-    "parents": [
-     {
-      "kind": "drive#parentReference",
-      "id": "0AIv7G8yEYAWHUk9ABC",
-      "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHYW1OcExsUVZLABC/parents/0AIv7G8yEYAWHUk9ABC",
-      "parentLink": "https://www.googleapis.com/drive/v2/files/0AIv7G8yEYAWHUk9ABC",
-      "isRoot": true
-     }
-    ],
-    "userPermission": {
-     "kind": "drive#permission",
-     "etag": "\"Lp2bjAtLP341hvGmYHhxjYyBPJ8/ID_i9phaKU8rzxPcIL8yOWlMABC\"",
-     "id": "me",
-     "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHYW1OcExsUVZLABC/permissions/me",
-     "role": "owner",
-     "type": "user"
-    },
-    "quotaBytesUsed": "0",
-    "ownerNames": [
-     "Test User"
-    ],
-    "lastModifyingUserName": "Test User",
-    "editable": true,
-    "writersCanShare": true
-   }
-  },
-  {
-    "kind": "drive#change",
-    "id": "8430",
-    "fileId": "ABCv7G8yEYAWHc3Y5X0hMSkJYXYZ",
-    "selfLink": "https://www.googleapis.com/drive/v2/changes/16429",
-    "deleted": true
-  }
- ]
-}
diff --git a/chrome/test/data/drive/filelist.json b/chrome/test/data/drive/filelist.json
deleted file mode 100644
index d15721a..0000000
--- a/chrome/test/data/drive/filelist.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "kind": "drive#fileList",
- "etag": "\"WtRjAPZWbDA7_fkFjc5ojsEvDEF/zyHTfoHpnRHovyi8bWpwK0DXABC\"",
- "selfLink": "https://www.googleapis.com/drive/v2/files",
- "nextPageToken": "EAIaggELEgA6egpi96It9mH_____f_8AAP__AAD_okhU-cHLz83KzszMxsjMzs_RyNGJnridyrbHs7u9tv8AAP__AP7__n__AP8AokhU-cHLz83KzszMxsjMzs_RyNGJnridyrbHs7u9tv8A__4QZCEiXPTi_wtIgTkAAAAAngnSXUgCDEAAIgsJPgart10AAAAABC",
- "nextLink": "https://www.googleapis.com/drive/v2/files?pageToken=EAIaggELEgA6egpi96It9mH_____f_8AAP__AAD_okhU-cHLz83KzszMxsjMzs_RyNGJnridyrbHs7u9tv8AAP__AP7__n__AP8AokhU-cHLz83KzszMxsjMzs_RyNGJnridyrbHs7u9tv8A__4QZCEiXPTi_wtIgTkAAAAAngnSXUgCDEAAIgsJPgart10AAAAABC",
- "items": [
-  {
-   "kind": "drive#file",
-   "id": "0B4v7G8yEYAWHUmRrU2lMS2hLABC",
-   "etag": "\"WtRjAPZWbDA7_fkFjc5ojsEvDEF/MTM0MzM2NzgwMDIXYZ\"",
-   "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHUmRrU2lMS2hLABC",
-   "webContentLink": "https://docs.google.com/uc?id=0B4v7G8yEYAWHUmRrU2lMS2hLABC&export=download",
-   "alternateLink": "https://docs.google.com/file/d/0B4v7G8yEYAWHUmRrU2lMS2hLABC/edit",
-   "title": "My first file data",
-   "mimeType": "application/octet-stream",
-   "labels": {
-    "starred": false,
-    "hidden": false,
-    "trashed": false,
-    "restricted": false,
-    "viewed": true
-   },
-   "createdDate": "2012-07-24T08:51:16.570Z",
-   "modifiedDate": "2012-07-27T05:43:20.269Z",
-   "modifiedByMeDate": "2012-07-27T05:43:20.269Z",
-   "lastViewedByMeDate": "2012-07-27T05:43:20.269Z",
-   "parents": [
-    {
-     "kind": "drive#parentReference",
-     "id": "0B4v7G8yEYAWHYW1OcExsUVZLABC",
-     "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHNGpYVHJINEFFABC/parents/0B4v7G8yEYAWHYW1OcExsUVZLABC",
-     "parentLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHYW1OcExsUVZLABC",
-     "isRoot": false
-    }
-   ],
-   "downloadUrl": "https://www.example.com/download",
-   "userPermission": {
-    "kind": "drive#permission",
-    "etag": "\"WtRjAPZWbDA7_fkFjc5ojsEvDEF/LKOJhhwatz2OKj-OblM3EvO8XYZ\"",
-    "id": "me",
-    "role": "owner",
-    "type": "user"
-   },
-   "originalFilename": "Untitled Document.ext",
-   "fileExtension": "ext",
-   "md5Checksum": "d41d8cd98f00b204e9800998ecf8427e",
-   "fileSize": "1000",
-   "quotaBytesUsed": "1000",
-   "ownerNames": [
-    "Test User"
-   ],
-   "lastModifyingUserName": "Test User",
-   "editable": true,
-   "writersCanShare": true
-  },
-  {
-   "kind": "drive#file",
-   "id": "1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC",
-   "etag": "\"WtRjAPZWbDA7_fkFjc5ojsEvDEF/MTM0MzM2NDg1MTAXYZ\"",
-   "selfLink": "https://www.googleapis.com/drive/v2/files/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC",
-   "alternateLink": "https://docs.google.com/a/chromium.org/document/d/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC/edit",
-   "embedLink": "https://docs.google.com/a/chromium.org/document/d/1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC/preview",
-   "thumbnailLink": "https://docs.google.com/feeds/vt?gd=true&id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&v=3&s=AMedNnoAAAAAUBJyB0g8HbxZaLRnlztxefZPS24LiXYZ&sz=s220",
-   "title": "Test Google Document",
-   "mimeType": "application/vnd.google-apps.document",
-   "labels": {
-    "starred": true,
-    "hidden": true,
-    "trashed": true,
-    "restricted": true,
-    "viewed": true
-   },
-   "createdDate": "2012-07-27T04:54:09.686Z",
-   "modifiedDate": "2012-07-27T04:54:11.030Z",
-   "modifiedByMeDate": "2012-07-27T04:54:11.030Z",
-   "lastViewedByMeDate": "2012-07-27T04:54:11.030Z",
-   "exportLinks": {
-    "application/msword": "https://docs.google.com/feeds/download/documents/export/Export?id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&exportFormat=doc",
-    "text/html": "https://docs.google.com/feeds/download/documents/export/Export?id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&exportFormat=html",
-    "application/pdf": "https://docs.google.com/feeds/download/documents/export/Export?id=1Pc8jzfU1ErbN_eucMMqdqzY3eBm0v8sxXm_1CtLxABC&exportFormat=pdf"
-   },
-   "userPermission": {
-    "kind": "drive#permission",
-    "etag": "\"WtRjAPZWbDA7_fkFjc5ojsEvDEF/LKOJhhwatz2OKj-OblM3EvO8XYZ\"",
-    "id": "me",
-    "role": "owner",
-    "type": "user"
-   },
-   "quotaBytesUsed": "0",
-   "ownerNames": [
-    "Test User"
-   ],
-   "lastModifyingUserName": "Test User",
-   "editable": true,
-   "writersCanShare": true
-  },
-  {
-   "kind": "drive#file",
-   "id": "0B4v7G8yEYAWHYW1OcExsUVZLABC",
-   "etag": "\"WtRjAPZWbDA7_fkFjc5ojsEvDEF/MTM0MzM2NDE5ODUXYZ\"",
-   "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHYW1OcExsUVZLABC",
-   "alternateLink": "https://docs.google.com/a/chromium.org/folder/d/0B4v7G8yEYAWHYW1OcExsUVZLABC/edit",
-   "title": "TestFolder",
-   "mimeType": "application/vnd.google-apps.folder",
-   "labels": {
-    "starred": false,
-    "hidden": false,
-    "trashed": false,
-    "restricted": false,
-    "viewed": true
-   },
-   "createdDate": "2012-07-02T09:53:18.422Z",
-   "modifiedDate": "2012-07-27T04:43:18.507Z",
-   "modifiedByMeDate": "2012-07-27T04:43:18.507Z",
-   "lastViewedByMeDate": "2012-07-27T04:40:52.371Z",
-   "parents": [
-    {
-     "kind": "drive#parentReference",
-     "id": "0AIv7G8yEYAWHUk9ABC",
-     "selfLink": "https://www.googleapis.com/drive/v2/files/0B4v7G8yEYAWHYW1OcExsUVZLABC/parents/0AIv7G8yEYAWHUk9ABC",
-     "parentLink": "https://www.googleapis.com/drive/v2/files/0AIv7G8yEYAWHUk9ABC",
-     "isRoot": true
-    }
-   ],
-   "userPermission": {
-    "kind": "drive#permission",
-    "etag": "\"WtRjAPZWbDA7_fkFjc5ojsEvDEF/LKOJhhwatz2OKj-OblM3EvO8XYZ\"",
-    "id": "me",
-    "role": "owner",
-    "type": "user"
-   },
-   "quotaBytesUsed": "0",
-   "ownerNames": [
-    "Test User"
-   ],
-   "lastModifyingUserName": "Test User",
-   "editable": true,
-   "writersCanShare": true
-  }
- ]
-}