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

Unified Diff: content/zygote/zygote_main_linux.cc

Issue 10446043: Cleanup: Remove the C version of GetUrandomFD() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright Created 8 years, 7 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
« no previous file with comments | « content/common/sandbox_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/zygote/zygote_main_linux.cc
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
index 37b3d25df80b18261dc11e372ff9910d533701a8..bbc0a0fcf453cfb166466b1801ee0876575c1de3 100644
--- a/content/zygote/zygote_main_linux.cc
+++ b/content/zygote/zygote_main_linux.cc
@@ -22,7 +22,6 @@
#include "base/pickle.h"
#include "base/process_util.h"
#include "base/rand_util.h"
-#include "base/rand_util_c.h"
#include "base/sys_info.h"
#include "build/build_config.h"
#include "crypto/nss_util.h"
@@ -340,7 +339,7 @@ FILE* fopen_override(const char* path, const char* mode) __asm__ ("fopen");
__attribute__ ((__visibility__("default")))
FILE* fopen_override(const char* path, const char* mode) {
if (g_am_zygote_or_renderer && strcmp(path, kUrandomDevPath) == 0) {
- int fd = HANDLE_EINTR(dup(GetUrandomFD()));
+ int fd = HANDLE_EINTR(dup(base::GetUrandomFD()));
if (fd < 0) {
PLOG(ERROR) << "dup() failed.";
return NULL;
@@ -356,7 +355,7 @@ FILE* fopen_override(const char* path, const char* mode) {
__attribute__ ((__visibility__("default")))
FILE* fopen64(const char* path, const char* mode) {
if (g_am_zygote_or_renderer && strcmp(path, kUrandomDevPath) == 0) {
- int fd = HANDLE_EINTR(dup(GetUrandomFD()));
+ int fd = HANDLE_EINTR(dup(base::GetUrandomFD()));
if (fd < 0) {
PLOG(ERROR) << "dup() failed.";
return NULL;
@@ -379,7 +378,7 @@ int xstat_override(int version,
__attribute__ ((__visibility__("default")))
int xstat_override(int version, const char *path, struct stat *buf) {
if (g_am_zygote_or_renderer && strcmp(path, kUrandomDevPath) == 0) {
- int result = __fxstat(version, GetUrandomFD(), buf);
+ int result = __fxstat(version, base::GetUrandomFD(), buf);
return result;
} else {
CHECK_EQ(0, pthread_once(&g_libc_file_io_funcs_guard,
@@ -396,7 +395,7 @@ int xstat64_override(int version,
__attribute__ ((__visibility__("default")))
int xstat64_override(int version, const char *path, struct stat64 *buf) {
if (g_am_zygote_or_renderer && strcmp(path, kUrandomDevPath) == 0) {
- int result = __fxstat64(version, GetUrandomFD(), buf);
+ int result = __fxstat64(version, base::GetUrandomFD(), buf);
return result;
} else {
CHECK_EQ(0, pthread_once(&g_libc_file_io_funcs_guard,
« no previous file with comments | « content/common/sandbox_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698