Mojo C++ bindings: switch components/filesystem mojom target to use STL types.

components/filesystem/directory_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <string>
 
@@ skipping 28 matching lines @@
   }
   // Make a directory.
   error = mojom::FileError::FAILED;
   bool handled = directory->OpenDirectory(
       "my_dir", nullptr,
       mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagCreate, &error);
   ASSERT_TRUE(handled);
   EXPECT_EQ(mojom::FileError::OK, error);
 
   error = mojom::FileError::FAILED;
-  mojo::Array<mojom::DirectoryEntryPtr> directory_contents;
+  base::Optional<std::vector<mojom::DirectoryEntryPtr>> directory_contents;
   handled = directory->Read(&error, &directory_contents);
   ASSERT_TRUE(handled);
   EXPECT_EQ(mojom::FileError::OK, error);
+  ASSERT_TRUE(directory_contents.has_value());
 
   // Expected contents of the directory.
   std::map<std::string, mojom::FsFileType> expected_contents;
   expected_contents["my_file1"] = mojom::FsFileType::REGULAR_FILE;
   expected_contents["my_file2"] = mojom::FsFileType::REGULAR_FILE;
   expected_contents["my_file3"] = mojom::FsFileType::REGULAR_FILE;
   expected_contents["my_dir"] = mojom::FsFileType::DIRECTORY;
   // Note: We don't expose ".." or ".".
 
-  EXPECT_EQ(expected_contents.size(), directory_contents.size());
-  for (size_t i = 0; i < directory_contents.size(); i++) {
-    ASSERT_TRUE(directory_contents[i]);
-    ASSERT_TRUE(directory_contents[i]->name);
-    auto it = expected_contents.find(directory_contents[i]->name.get());
+  EXPECT_EQ(expected_contents.size(), directory_contents->size());
+  for (size_t i = 0; i < directory_contents->size(); i++) {
+    auto& item = directory_contents.value()[i];
+    ASSERT_TRUE(item);
+    auto it = expected_contents.find(item->name);
     ASSERT_TRUE(it != expected_contents.end());
-    EXPECT_EQ(it->second, directory_contents[i]->type);
+    EXPECT_EQ(it->second, item->type);
     expected_contents.erase(it);
   }
 }
 
 // TODO(vtl): Properly test OpenFile() and OpenDirectory() (including flags).
 
 TEST_F(DirectoryImplTest, BasicRenameDelete) {
   mojom::DirectoryPtr directory;
   GetTemporaryRoot(&directory);
   mojom::FileError error;
@@ skipping 91 matching lines @@
 
   std::string data("one two three");
   {
     bool handled =
         clone_one->WriteFile("data", mojo::Array<uint8_t>::From(data), &error);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::OK, error);
   }
 
   {
-    mojo::Array<uint8_t> file_contents;
+    std::vector<uint8_t> file_contents;
     bool handled = clone_two->ReadEntireFile("data", &error, &file_contents);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::OK, error);
 
-    EXPECT_EQ(data, file_contents.To<std::string>());
+    EXPECT_EQ(data,
+              mojo::Array<uint8_t>(std::move(file_contents)).To<std::string>());
   }
 }
 
 TEST_F(DirectoryImplTest, WriteFileReadFile) {
   mojom::DirectoryPtr directory;
   GetTemporaryRoot(&directory);
   mojom::FileError error;
 
   std::string data("one two three");
   {
     bool handled =
         directory->WriteFile("data", mojo::Array<uint8_t>::From(data), &error);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::OK, error);
   }
 
   {
-    mojo::Array<uint8_t> file_contents;
+    std::vector<uint8_t> file_contents;
     bool handled = directory->ReadEntireFile("data", &error, &file_contents);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::OK, error);
 
-    EXPECT_EQ(data, file_contents.To<std::string>());
+    EXPECT_EQ(data,
+              mojo::Array<uint8_t>(std::move(file_contents)).To<std::string>());
   }
 }
 
 TEST_F(DirectoryImplTest, ReadEmptyFileIsNotFoundError) {
   mojom::DirectoryPtr directory;
   GetTemporaryRoot(&directory);
   mojom::FileError error;
 
   {
-    mojo::Array<uint8_t> file_contents;
+    std::vector<uint8_t> file_contents;
     bool handled =
         directory->ReadEntireFile("doesnt_exist", &error, &file_contents);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::NOT_FOUND, error);
   }
 }
 
 TEST_F(DirectoryImplTest, CantReadEntireFileOnADirectory) {
   mojom::DirectoryPtr directory;
   GetTemporaryRoot(&directory);
   mojom::FileError error;
 
   // Create a directory
   {
     mojom::DirectoryPtr my_file_directory;
     error = mojom::FileError::FAILED;
     bool handled = directory->OpenDirectory(
         "my_dir", GetProxy(&my_file_directory),
         mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagCreate, &error);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::OK, error);
   }
 
   // Try to read it as a file
   {
-    mojo::Array<uint8_t> file_contents;
+    std::vector<uint8_t> file_contents;
     bool handled = directory->ReadEntireFile("my_dir", &error, &file_contents);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::NOT_A_FILE, error);
   }
 }
 
 TEST_F(DirectoryImplTest, CantWriteFileOnADirectory) {
   mojom::DirectoryPtr directory;
   GetTemporaryRoot(&directory);
   mojom::FileError error;
@@ skipping 15 matching lines @@
         "my_dir", mojo::Array<uint8_t>::From(data), &error);
     ASSERT_TRUE(handled);
     EXPECT_EQ(mojom::FileError::NOT_A_FILE, error);
   }
 }
 
 // TODO(vtl): Test delete flags.
 
 }  // namespace
 }  // namespace filesystem