Index: mojo/edk/test/test_utils.h |
diff --git a/mojo/edk/test/test_utils.h b/mojo/edk/test/test_utils.h |
index 72f92578b1a6fef19e4c62abab6e1fe789725d8d..42aa55b6787668460ead888cc127a026e1fabef8 100644 |
--- a/mojo/edk/test/test_utils.h |
+++ b/mojo/edk/test/test_utils.h |
@@ -7,8 +7,8 @@ |
#include <stddef.h> |
-#include "mojo/edk/embedder/platform_handle.h" |
-#include "mojo/edk/embedder/scoped_platform_handle.h" |
+#include "mojo/edk/platform/platform_handle.h" |
+#include "mojo/edk/platform/scoped_platform_handle.h" |
#include "mojo/edk/util/scoped_file.h" |
namespace mojo { |
@@ -16,14 +16,14 @@ namespace test { |
// On success, |bytes_written| is updated to the number of bytes written; |
// otherwise it is untouched. |
-bool BlockingWrite(const embedder::PlatformHandle& handle, |
+bool BlockingWrite(const platform::PlatformHandle& handle, |
const void* buffer, |
size_t bytes_to_write, |
size_t* bytes_written); |
// On success, |bytes_read| is updated to the number of bytes read; otherwise it |
// is untouched. |
-bool BlockingRead(const embedder::PlatformHandle& handle, |
+bool BlockingRead(const platform::PlatformHandle& handle, |
void* buffer, |
size_t buffer_size, |
size_t* bytes_read); |
@@ -32,16 +32,16 @@ bool BlockingRead(const embedder::PlatformHandle& handle, |
// and updates |bytes_read| to the number of bytes read (0 if the read would |
// block); otherwise it returns false and leaves |bytes_read| untouched. |
// |handle| must already be in non-blocking mode. |
-bool NonBlockingRead(const embedder::PlatformHandle& handle, |
+bool NonBlockingRead(const platform::PlatformHandle& handle, |
void* buffer, |
size_t buffer_size, |
size_t* bytes_read); |
// Gets a (scoped) |PlatformHandle| from the given (scoped) |FILE|. |
-embedder::ScopedPlatformHandle PlatformHandleFromFILE(util::ScopedFILE fp); |
+platform::ScopedPlatformHandle PlatformHandleFromFILE(util::ScopedFILE fp); |
// Gets a (scoped) |FILE| from a (scoped) |PlatformHandle|. |
-util::ScopedFILE FILEFromPlatformHandle(embedder::ScopedPlatformHandle h, |
+util::ScopedFILE FILEFromPlatformHandle(platform::ScopedPlatformHandle h, |
const char* mode); |
} // namespace test |