| Index: mojo/edk/test/test_utils_win.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/test/test_utils_win.cc b/mojo/edk/test/test_utils_win.cc
|
| similarity index 87%
|
| copy from third_party/mojo/src/mojo/edk/test/test_utils_win.cc
|
| copy to mojo/edk/test/test_utils_win.cc
|
| index c74f009989ade4ceaaeffebc8730701e11647766..57a255036a9ffc9c78d47feda5beb44c4e102162 100644
|
| --- a/third_party/mojo/src/mojo/edk/test/test_utils_win.cc
|
| +++ b/mojo/edk/test/test_utils_win.cc
|
| @@ -10,9 +10,10 @@
|
| #include <string.h>
|
|
|
| namespace mojo {
|
| +namespace edk {
|
| namespace test {
|
|
|
| -bool BlockingWrite(const embedder::PlatformHandle& handle,
|
| +bool BlockingWrite(const PlatformHandle& handle,
|
| const void* buffer,
|
| size_t bytes_to_write,
|
| size_t* bytes_written) {
|
| @@ -32,7 +33,7 @@ bool BlockingWrite(const embedder::PlatformHandle& handle,
|
| return true;
|
| }
|
|
|
| -bool BlockingRead(const embedder::PlatformHandle& handle,
|
| +bool BlockingRead(const PlatformHandle& handle,
|
| void* buffer,
|
| size_t buffer_size,
|
| size_t* bytes_read) {
|
| @@ -52,7 +53,7 @@ bool BlockingRead(const embedder::PlatformHandle& handle,
|
| return true;
|
| }
|
|
|
| -bool NonBlockingRead(const embedder::PlatformHandle& handle,
|
| +bool NonBlockingRead(const PlatformHandle& handle,
|
| void* buffer,
|
| size_t buffer_size,
|
| size_t* bytes_read) {
|
| @@ -77,7 +78,7 @@ bool NonBlockingRead(const embedder::PlatformHandle& handle,
|
| return true;
|
| }
|
|
|
| -embedder::ScopedPlatformHandle PlatformHandleFromFILE(base::ScopedFILE fp) {
|
| +ScopedPlatformHandle PlatformHandleFromFILE(base::ScopedFILE fp) {
|
| CHECK(fp);
|
|
|
| HANDLE rv = INVALID_HANDLE_VALUE;
|
| @@ -86,10 +87,10 @@ embedder::ScopedPlatformHandle PlatformHandleFromFILE(base::ScopedFILE fp) {
|
| reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(fp.get()))),
|
| GetCurrentProcess(), &rv, 0, TRUE, DUPLICATE_SAME_ACCESS))
|
| << "DuplicateHandle";
|
| - return embedder::ScopedPlatformHandle(embedder::PlatformHandle(rv));
|
| + return ScopedPlatformHandle(PlatformHandle(rv));
|
| }
|
|
|
| -base::ScopedFILE FILEFromPlatformHandle(embedder::ScopedPlatformHandle h,
|
| +base::ScopedFILE FILEFromPlatformHandle(ScopedPlatformHandle h,
|
| const char* mode) {
|
| CHECK(h.is_valid());
|
| // Microsoft's documentation for |_open_osfhandle()| only discusses these
|
| @@ -109,4 +110,5 @@ base::ScopedFILE FILEFromPlatformHandle(embedder::ScopedPlatformHandle h,
|
| }
|
|
|
| } // namespace test
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|