diff options
| -rw-r--r-- | o3d/core/cross/message_queue_test.cc | 12 | ||||
| -rw-r--r-- | o3d/import/cross/main_thread_archive_callback_client.h | 2 | ||||
| -rw-r--r-- | o3d/import/cross/threaded_stream_processor.h | 2 | ||||
| -rw-r--r-- | o3d/plugin/mac/fullscreen_window_mac.mm | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/o3d/core/cross/message_queue_test.cc b/o3d/core/cross/message_queue_test.cc index fd8840d..c94eb52 100644 --- a/o3d/core/cross/message_queue_test.cc +++ b/o3d/core/cross/message_queue_test.cc @@ -42,10 +42,10 @@ #include "core/cross/types.h" #include "core/cross/renderer.h" #include "tests/common/win/testing_common.h" +#include "base/condition_variable.h" +#include "base/lock.h" #include "base/platform_thread.h" #include "base/time.h" -#include "base/synchronization/condition_variable.h" -#include "base/synchronization/lock.h" using ::base::Time; using ::base::TimeDelta; @@ -81,8 +81,8 @@ class WallClockTimeSource : public TimeSource { // of times, this indicates one failure mode of the test. class TestWatchdog { private: - base::Lock lock_; - base::ConditionVariable condition_; + Lock lock_; + ConditionVariable condition_; int expected_num_signals_; TimeDelta time_to_run_; TimeSource* time_source_; @@ -98,7 +98,7 @@ class TestWatchdog { time_source_(time_source) {} void Signal() { - base::AutoLock locker(lock_); + AutoLock locker(lock_); ASSERT_GE(expected_num_signals_, 0); --expected_num_signals_; condition_.Broadcast(); @@ -107,7 +107,7 @@ class TestWatchdog { // Pause the current thread briefly waiting for a signal so we don't // consume all CPU void WaitBrieflyForSignal() { - base::AutoLock locker(lock_); + AutoLock locker(lock_); condition_.TimedWait(TimeDelta::FromMilliseconds(5)); } diff --git a/o3d/import/cross/main_thread_archive_callback_client.h b/o3d/import/cross/main_thread_archive_callback_client.h index f1c9db6..7da39f7 100644 --- a/o3d/import/cross/main_thread_archive_callback_client.h +++ b/o3d/import/cross/main_thread_archive_callback_client.h @@ -36,7 +36,7 @@ #define O3D_IMPORT_CROSS_MAIN_THREAD_ARCHIVE_CALLBACK_CLIENT_H_ #include "base/basictypes.h" -#include "base/threading/thread.h" +#include "base/thread.h" #include "import/cross/archive_processor.h" #include "import/cross/memory_stream.h" diff --git a/o3d/import/cross/threaded_stream_processor.h b/o3d/import/cross/threaded_stream_processor.h index 2b5a4e5..f040eb4 100644 --- a/o3d/import/cross/threaded_stream_processor.h +++ b/o3d/import/cross/threaded_stream_processor.h @@ -37,7 +37,7 @@ #define O3D_IMPORT_CROSS_THREADED_STREAM_PROCESSOR_H_ #include "base/basictypes.h" -#include "base/threading/thread.h" +#include "base/thread.h" #include "import/cross/memory_stream.h" namespace o3d { diff --git a/o3d/plugin/mac/fullscreen_window_mac.mm b/o3d/plugin/mac/fullscreen_window_mac.mm index fd0a021..e2ba86c 100644 --- a/o3d/plugin/mac/fullscreen_window_mac.mm +++ b/o3d/plugin/mac/fullscreen_window_mac.mm @@ -38,8 +38,8 @@ #import "graphics_utils_mac.h" #import "overlay_window_mac.h" #import "plugin_mac.h" +#import "base/cocoa_protocols_mac.h" #import "base/logging.h" -#import "base/mac/cocoa_protocols.h" #import "base/scoped_nsobject.h" #import "core/cross/display_mode.h" #import "plugin/cross/o3d_glue.h" |