Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: mojo/edk/test/test_utils_win.cc

Issue 1347783002: Add our own (mojo::util::)ScopedFILE and replace uses of base::ScopedFILE with it. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/test/test_utils_win.cc
diff --git a/mojo/edk/test/test_utils_win.cc b/mojo/edk/test/test_utils_win.cc
index c74f009989ade4ceaaeffebc8730701e11647766..0750cba3f09933322f2e231853cb4bc5109e90b9 100644
--- a/mojo/edk/test/test_utils_win.cc
+++ b/mojo/edk/test/test_utils_win.cc
@@ -77,7 +77,7 @@ bool NonBlockingRead(const embedder::PlatformHandle& handle,
return true;
}
-embedder::ScopedPlatformHandle PlatformHandleFromFILE(base::ScopedFILE fp) {
+embedder::ScopedPlatformHandle PlatformHandleFromFILE(util::ScopedFILE fp) {
CHECK(fp);
HANDLE rv = INVALID_HANDLE_VALUE;
@@ -89,7 +89,7 @@ embedder::ScopedPlatformHandle PlatformHandleFromFILE(base::ScopedFILE fp) {
return embedder::ScopedPlatformHandle(embedder::PlatformHandle(rv));
}
-base::ScopedFILE FILEFromPlatformHandle(embedder::ScopedPlatformHandle h,
+util::ScopedFILE FILEFromPlatformHandle(embedder::ScopedPlatformHandle h,
const char* mode) {
CHECK(h.is_valid());
// Microsoft's documentation for |_open_osfhandle()| only discusses these
@@ -101,7 +101,7 @@ base::ScopedFILE FILEFromPlatformHandle(embedder::ScopedPlatformHandle h,
flags |= _O_RDONLY;
if (strchr(mode, 't'))
flags |= _O_TEXT;
- base::ScopedFILE rv(_fdopen(
+ util::ScopedFILE rv(_fdopen(
_open_osfhandle(reinterpret_cast<intptr_t>(h.release().handle), flags),
mode));
PCHECK(rv) << "_fdopen";

Powered by Google App Engine
This is Rietveld 408576698