| Index: base/memory/shared_memory.h
|
| diff --git a/base/memory/shared_memory.h b/base/memory/shared_memory.h
|
| index 8e32e7267334b0367dc0f97eb5a60f30e4382e44..50b61c4beef14b1eebd614ca89d24a02667b89d6 100644
|
| --- a/base/memory/shared_memory.h
|
| +++ b/base/memory/shared_memory.h
|
| @@ -22,7 +22,6 @@
|
| #if defined(OS_POSIX)
|
| #include "base/file_descriptor_posix.h"
|
| #include "base/file_util.h"
|
| -#include "base/files/scoped_file.h"
|
| #endif
|
|
|
| namespace base {
|
| @@ -260,7 +259,7 @@
|
|
|
| private:
|
| #if defined(OS_POSIX) && !defined(OS_NACL)
|
| - bool PrepareMapFile(file_util::ScopedFILE fp, base::ScopedFD readonly);
|
| + bool PrepareMapFile(file_util::ScopedFILE fp, file_util::ScopedFD readonly);
|
| bool FilePathForMemoryName(const std::string& mem_name, FilePath* path);
|
| void LockOrUnlockCommon(int function);
|
| #endif
|
|
|