| Index: chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc
|
| diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc
|
| index 33f38d626856383f94632b94e46deecaad8b806e..34a3ff7e2414a2eedaf85b6585a919a6918c03dc 100644
|
| --- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc
|
| +++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc
|
| @@ -27,6 +27,7 @@ namespace {
|
| const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
|
| const char kFileSystemId[] = "testing-file-system";
|
| const char kMimeType[] = "text/plain";
|
| +const char kThumbnail[] = "data:image/png;base64,";
|
| const int kRequestId = 2;
|
| const base::FilePath::CharType kDirectoryPath[] = "/directory";
|
|
|
| @@ -88,11 +89,13 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute) {
|
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
|
| CallbackLogger callback_logger;
|
|
|
| - GetMetadata get_metadata(NULL,
|
| - file_system_info_,
|
| - base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| - base::Bind(&CallbackLogger::OnGetMetadata,
|
| - base::Unretained(&callback_logger)));
|
| + GetMetadata get_metadata(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + ProvidedFileSystemInterface::METADATA_FIELD_THUMBNAIL,
|
| + base::Bind(&CallbackLogger::OnGetMetadata,
|
| + base::Unretained(&callback_logger)));
|
| get_metadata.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
| @@ -121,17 +124,23 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute) {
|
| std::string event_entry_path;
|
| EXPECT_TRUE(options->GetString("entryPath", &event_entry_path));
|
| EXPECT_EQ(kDirectoryPath, event_entry_path);
|
| +
|
| + bool event_thumbnail;
|
| + EXPECT_TRUE(options->GetBoolean("thumbnail", &event_thumbnail));
|
| + EXPECT_TRUE(event_thumbnail);
|
| }
|
|
|
| TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute_NoListener) {
|
| util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
|
| CallbackLogger callback_logger;
|
|
|
| - GetMetadata get_metadata(NULL,
|
| - file_system_info_,
|
| - base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| - base::Bind(&CallbackLogger::OnGetMetadata,
|
| - base::Unretained(&callback_logger)));
|
| + GetMetadata get_metadata(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + ProvidedFileSystemInterface::METADATA_FIELD_THUMBNAIL,
|
| + base::Bind(&CallbackLogger::OnGetMetadata,
|
| + base::Unretained(&callback_logger)));
|
| get_metadata.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
| @@ -146,11 +155,13 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, OnSuccess) {
|
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
|
| CallbackLogger callback_logger;
|
|
|
| - GetMetadata get_metadata(NULL,
|
| - file_system_info_,
|
| - base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| - base::Bind(&CallbackLogger::OnGetMetadata,
|
| - base::Unretained(&callback_logger)));
|
| + GetMetadata get_metadata(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + ProvidedFileSystemInterface::METADATA_FIELD_THUMBNAIL,
|
| + base::Bind(&CallbackLogger::OnGetMetadata,
|
| + base::Unretained(&callback_logger)));
|
| get_metadata.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
| @@ -171,7 +182,8 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, OnSuccess) {
|
| " \"modificationTime\": {\n"
|
| " \"value\": \"Thu Apr 24 00:46:52 UTC 2014\"\n"
|
| " },\n"
|
| - " \"mimeType\": \"text/plain\"\n" // kMimeType
|
| + " \"mimeType\": \"text/plain\",\n" // kMimeType
|
| + " \"thumbnail\": \"data:image/png;base64,\"\n" // kThumbnail
|
| " },\n"
|
| " 0\n" // execution_time
|
| "]\n";
|
| @@ -205,17 +217,20 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, OnSuccess) {
|
| base::Time::FromString("Thu Apr 24 00:46:52 UTC 2014", &expected_time));
|
| EXPECT_EQ(expected_time, metadata.modification_time);
|
| EXPECT_EQ(kMimeType, metadata.mime_type);
|
| + EXPECT_EQ(kThumbnail, metadata.thumbnail);
|
| }
|
|
|
| TEST_F(FileSystemProviderOperationsGetMetadataTest, OnError) {
|
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
|
| CallbackLogger callback_logger;
|
|
|
| - GetMetadata get_metadata(NULL,
|
| - file_system_info_,
|
| - base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| - base::Bind(&CallbackLogger::OnGetMetadata,
|
| - base::Unretained(&callback_logger)));
|
| + GetMetadata get_metadata(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + ProvidedFileSystemInterface::METADATA_FIELD_THUMBNAIL,
|
| + base::Bind(&CallbackLogger::OnGetMetadata,
|
| + base::Unretained(&callback_logger)));
|
| get_metadata.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
|
|