diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /base/shared_memory_posix.cc | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'base/shared_memory_posix.cc')
| -rw-r--r-- | base/shared_memory_posix.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/shared_memory_posix.cc b/base/shared_memory_posix.cc index 88203dd..e83b982 100644 --- a/base/shared_memory_posix.cc +++ b/base/shared_memory_posix.cc @@ -12,9 +12,9 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/platform_thread.h" +#include "base/threading/platform_thread.h" #include "base/safe_strerror_posix.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" namespace base { @@ -300,7 +300,7 @@ void SharedMemory::LockOrUnlockCommon(int function) { continue; } else if (errno == ENOLCK) { // temporary kernel resource exaustion - PlatformThread::Sleep(500); + base::PlatformThread::Sleep(500); continue; } else { NOTREACHED() << "lockf() failed." |