Index: chrome/browser/drive/drive_api_util_unittest.cc |
diff --git a/chrome/browser/drive/drive_api_util_unittest.cc b/chrome/browser/drive/drive_api_util_unittest.cc |
index d8e9f8a4e650c9ca578459f09ebb2a4909bdaafb..819fc3894114ef2841fd7b5d4561cc22db1fe369 100644 |
--- a/chrome/browser/drive/drive_api_util_unittest.cc |
+++ b/chrome/browser/drive/drive_api_util_unittest.cc |
@@ -53,17 +53,6 @@ TEST(DriveApiUtilTest, TranslateQuery) { |
EXPECT_EQ("fullText contains 'dog'", TranslateQuery("\"\" dog \"\"")); |
} |
-TEST(FileSystemUtilTest, ExtractResourceIdFromUrl) { |
- EXPECT_EQ("file:2_file_resource_id", ExtractResourceIdFromUrl( |
- GURL("https://file1_link_self/file:2_file_resource_id"))); |
- // %3A should be unescaped. |
- EXPECT_EQ("file:2_file_resource_id", ExtractResourceIdFromUrl( |
- GURL("https://file1_link_self/file%3A2_file_resource_id"))); |
- |
- // The resource ID cannot be extracted, hence empty. |
- EXPECT_EQ("", ExtractResourceIdFromUrl(GURL("https://www.example.com/"))); |
-} |
- |
TEST(FileSystemUtilTest, CanonicalizeResourceId) { |
std::string resource_id("1YsCnrMxxgp7LDdtlFDt-WdtEIth89vA9inrILtvK-Ug"); |
@@ -79,80 +68,6 @@ TEST(FileSystemUtilTest, CanonicalizeResourceId) { |
EXPECT_EQ(resource_id, CanonicalizeResourceId("externalapp:" + resource_id)); |
} |
-TEST(FileSystemUtilTest, ConvertFileResourceToResource_Parents) { |
- google_apis::FileResource file_resource; |
- |
- std::vector<GURL> expected_links; |
- expected_links.push_back(GURL("http://server/id1")); |
- expected_links.push_back(GURL("http://server/id2")); |
- expected_links.push_back(GURL("http://server/id3")); |
- |
- for (size_t i = 0; i < expected_links.size(); ++i) { |
- google_apis::ParentReference parent; |
- parent.set_parent_link(expected_links[i]); |
- file_resource.mutable_parents()->push_back(parent); |
- } |
- |
- scoped_ptr<google_apis::ResourceEntry> entry( |
- ConvertFileResourceToResourceEntry(file_resource)); |
- std::vector<GURL> actual_links; |
- for (size_t i = 0; i < entry->links().size(); ++i) { |
- if (entry->links()[i]->type() == google_apis::Link::LINK_PARENT) |
- actual_links.push_back(entry->links()[i]->href()); |
- } |
- |
- EXPECT_EQ(expected_links, actual_links); |
-} |
- |
-TEST(FileSystemUtilTest, ConvertFileResourceToResourceEntryImageMediaMetadata) { |
- google_apis::FileResource file_resource_all_fields; |
- google_apis::FileResource file_resource_zero_fields; |
- google_apis::FileResource file_resource_no_fields; |
- // Set up FileResource instances; |
- { |
- { |
- google_apis::ImageMediaMetadata* image_media_metadata = |
- file_resource_all_fields.mutable_image_media_metadata(); |
- image_media_metadata->set_width(640); |
- image_media_metadata->set_height(480); |
- image_media_metadata->set_rotation(90); |
- } |
- { |
- google_apis::ImageMediaMetadata* image_media_metadata = |
- file_resource_zero_fields.mutable_image_media_metadata(); |
- image_media_metadata->set_width(0); |
- image_media_metadata->set_height(0); |
- image_media_metadata->set_rotation(0); |
- } |
- } |
- |
- // Verify the converted values. |
- { |
- scoped_ptr<google_apis::ResourceEntry> resource_entry( |
- ConvertFileResourceToResourceEntry(file_resource_all_fields)); |
- |
- EXPECT_EQ(640, resource_entry->image_width()); |
- EXPECT_EQ(480, resource_entry->image_height()); |
- EXPECT_EQ(90, resource_entry->image_rotation()); |
- } |
- { |
- scoped_ptr<google_apis::ResourceEntry> resource_entry( |
- ConvertFileResourceToResourceEntry(file_resource_zero_fields)); |
- |
- EXPECT_EQ(0, resource_entry->image_width()); |
- EXPECT_EQ(0, resource_entry->image_height()); |
- EXPECT_EQ(0, resource_entry->image_rotation()); |
- } |
- { |
- scoped_ptr<google_apis::ResourceEntry> resource_entry( |
- ConvertFileResourceToResourceEntry(file_resource_no_fields)); |
- |
- EXPECT_EQ(-1, resource_entry->image_width()); |
- EXPECT_EQ(-1, resource_entry->image_height()); |
- EXPECT_EQ(-1, resource_entry->image_rotation()); |
- } |
-} |
- |
TEST(DriveAPIUtilTest, GetMd5Digest) { |
base::ScopedTempDir temp_dir; |
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); |