| Index: mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
|
| diff --git a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc b/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
|
| index 0b20f4b57b5188ae692b9cca9834e7d1732f667f..8857ecc1339c2e826bf0ecc3f26af0a8d9cbb24d 100644
|
| --- a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
|
| +++ b/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
|
| @@ -15,7 +15,6 @@
|
|
|
| #include <deque>
|
|
|
| -#include "base/files/scoped_file.h"
|
| #include "base/logging.h"
|
| #include "build/build_config.h"
|
| #include "mojo/edk/embedder/platform_channel_utils_posix.h"
|
| @@ -23,6 +22,7 @@
|
| #include "mojo/edk/embedder/platform_handle_vector.h"
|
| #include "mojo/edk/embedder/scoped_platform_handle.h"
|
| #include "mojo/edk/test/test_utils.h"
|
| +#include "mojo/edk/util/scoped_file.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -166,7 +166,7 @@ TEST_F(PlatformChannelPairPosixTest, SendReceiveFDs) {
|
| const char c = '0' + (i % 10);
|
| ScopedPlatformHandleVectorPtr platform_handles(new PlatformHandleVector);
|
| for (size_t j = 1; j <= i; j++) {
|
| - base::ScopedFILE fp(NewTmpFile());
|
| + util::ScopedFILE fp(NewTmpFile());
|
| ASSERT_TRUE(fp);
|
| ASSERT_EQ(j, fwrite(std::string(j, c).data(), 1, j, fp.get()));
|
| platform_handles->push_back(
|
| @@ -194,7 +194,7 @@ TEST_F(PlatformChannelPairPosixTest, SendReceiveFDs) {
|
| EXPECT_EQ(i, received_handles.size());
|
|
|
| for (size_t j = 0; !received_handles.empty(); j++) {
|
| - base::ScopedFILE fp(test::FILEFromPlatformHandle(
|
| + util::ScopedFILE fp(test::FILEFromPlatformHandle(
|
| ScopedPlatformHandle(received_handles.front()), "rb"));
|
| received_handles.pop_front();
|
| ASSERT_TRUE(fp);
|
| @@ -217,7 +217,7 @@ TEST_F(PlatformChannelPairPosixTest, AppendReceivedFDs) {
|
| const std::string file_contents("hello world");
|
|
|
| {
|
| - base::ScopedFILE fp(NewTmpFile());
|
| + util::ScopedFILE fp(NewTmpFile());
|
| ASSERT_TRUE(fp);
|
| ASSERT_EQ(file_contents.size(),
|
| fwrite(file_contents.data(), 1, file_contents.size(), fp.get()));
|
| @@ -252,7 +252,7 @@ TEST_F(PlatformChannelPairPosixTest, AppendReceivedFDs) {
|
| EXPECT_TRUE(received_handles[1].is_valid());
|
|
|
| {
|
| - base::ScopedFILE fp(test::FILEFromPlatformHandle(
|
| + util::ScopedFILE fp(test::FILEFromPlatformHandle(
|
| ScopedPlatformHandle(received_handles[1]), "rb"));
|
| received_handles[1] = PlatformHandle();
|
| ASSERT_TRUE(fp);
|
|
|