Index: components/filesystem/file_impl_unittest.cc |
diff --git a/components/filesystem/file_impl_unittest.cc b/components/filesystem/file_impl_unittest.cc |
index be20bfbe9c7cc00f755fcb826a36912e0fb0ff3a..492c243c64788e7b5ec8dfae1e9ea6889442a86d 100644 |
--- a/components/filesystem/file_impl_unittest.cc |
+++ b/components/filesystem/file_impl_unittest.cc |
@@ -28,7 +28,7 @@ TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -66,7 +66,7 @@ TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("your_file", GetProxy(&file), |
+ directory->OpenFile("your_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagOpen, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -104,7 +104,7 @@ TEST_F(FileImplTest, CantWriteInReadMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -130,7 +130,7 @@ TEST_F(FileImplTest, CantWriteInReadMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagOpen, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -163,7 +163,7 @@ TEST_F(FileImplTest, OpenInAppendMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -195,7 +195,7 @@ TEST_F(FileImplTest, OpenInAppendMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagAppend | mojom::kFlagOpen, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -229,7 +229,7 @@ TEST_F(FileImplTest, OpenInAppendMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagOpen, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -259,7 +259,7 @@ TEST_F(FileImplTest, OpenInTruncateMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -291,7 +291,7 @@ TEST_F(FileImplTest, OpenInTruncateMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = directory->OpenFile( |
- "my_file", GetProxy(&file), |
+ "my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagOpenTruncated, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -325,7 +325,7 @@ TEST_F(FileImplTest, OpenInTruncateMode) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagOpen, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -356,7 +356,7 @@ TEST_F(FileImplTest, StatTouch) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -427,7 +427,7 @@ TEST_F(FileImplTest, TellSeek) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -513,7 +513,7 @@ TEST_F(FileImplTest, Dup) { |
mojom::FilePtr file1; |
error = mojom::FileError::FAILED; |
bool handled = directory->OpenFile( |
- "my_file", GetProxy(&file1), |
+ "my_file", MakeRequest(&file1), |
mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -537,7 +537,7 @@ TEST_F(FileImplTest, Dup) { |
// Dup it. |
mojom::FilePtr file2; |
error = mojom::FileError::FAILED; |
- handled = file1->Dup(GetProxy(&file2), &error); |
+ handled = file1->Dup(MakeRequest(&file2), &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -607,7 +607,7 @@ TEST_F(FileImplTest, Truncate) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file), |
+ directory->OpenFile("my_file", MakeRequest(&file), |
mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -657,7 +657,7 @@ TEST_F(FileImplTest, AsHandle) { |
mojom::FilePtr file1; |
error = mojom::FileError::FAILED; |
bool handled = directory->OpenFile( |
- "my_file", GetProxy(&file1), |
+ "my_file", MakeRequest(&file1), |
mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -678,7 +678,7 @@ TEST_F(FileImplTest, AsHandle) { |
mojom::FilePtr file2; |
error = mojom::FileError::FAILED; |
bool handled = |
- directory->OpenFile("my_file", GetProxy(&file2), |
+ directory->OpenFile("my_file", MakeRequest(&file2), |
mojom::kFlagRead | mojom::kFlagOpen, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -708,7 +708,7 @@ TEST_F(FileImplTest, SimpleLockUnlock) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = directory->OpenFile( |
- "my_file", GetProxy(&file), |
+ "my_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -735,7 +735,7 @@ TEST_F(FileImplTest, CantDoubleLock) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = directory->OpenFile( |
- "my_file", GetProxy(&file), |
+ "my_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagCreate, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -763,7 +763,7 @@ TEST_F(FileImplTest, ClosingFileClearsLock) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = directory->OpenFile( |
- "my_file", GetProxy(&file), |
+ "my_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagOpenAlways, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |
@@ -780,7 +780,7 @@ TEST_F(FileImplTest, ClosingFileClearsLock) { |
mojom::FilePtr file; |
error = mojom::FileError::FAILED; |
bool handled = directory->OpenFile( |
- "my_file", GetProxy(&file), |
+ "my_file", MakeRequest(&file), |
mojom::kFlagRead | mojom::kFlagWrite | mojom::kFlagOpenAlways, &error); |
ASSERT_TRUE(handled); |
EXPECT_EQ(mojom::FileError::OK, error); |