diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 23:19:46 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 23:19:46 +0000 |
| commit | 54becb736fb020a902393a695142f270f51de1c3 (patch) | |
| tree | 5025cf293398881765968103fcddfd37649512a2 /o3d | |
| parent | 398841d7b307c88957f6cb5af38f557d942adbf8 (diff) | |
| download | chromium_src-54becb736fb020a902393a695142f270f51de1c3.zip chromium_src-54becb736fb020a902393a695142f270f51de1c3.tar.gz chromium_src-54becb736fb020a902393a695142f270f51de1c3.tar.bz2 | |
Fix message queue test build breakage.
Review URL: http://codereview.chromium.org/159315
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/base/build.scons | 2 | ||||
| -rw-r--r-- | o3d/core/cross/message_queue_test.cc | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/o3d/base/build.scons b/o3d/base/build.scons index 45fa4bd..f6cd4a0 100644 --- a/o3d/base/build.scons +++ b/o3d/base/build.scons @@ -110,6 +110,8 @@ chrome_base_inputs_posix = [ 'lock_impl_posix', 'platform_thread_posix', 'string16', + 'time', + 'time_posix', 'thread_local_posix', 'thread_local_storage_posix', ] diff --git a/o3d/core/cross/message_queue_test.cc b/o3d/core/cross/message_queue_test.cc index 9915629..77ba145 100644 --- a/o3d/core/cross/message_queue_test.cc +++ b/o3d/core/cross/message_queue_test.cc @@ -415,9 +415,9 @@ bool TextureUpdateHelper::ConnectToO3D(const char* o3d_address, vec.length = message_size; nacl::SocketAddress socket_address; - sprintf_s(socket_address.path, - sizeof(socket_address.path), - "%s", o3d_address); + ::base::snprintf(socket_address.path, + sizeof(socket_address.path), + "%s", o3d_address); header.iov = &vec; header.iov_length = 1; @@ -724,8 +724,8 @@ TEST_F(MessageQueueTest, TestConnection) { } }; - RunTests(1, TimeDelta::FromSeconds(1), - scoped_ptr<Provider>(new Provider()).get()); + Provider provider; + RunTests(1, TimeDelta::FromSeconds(1), &provider); } // Tests a request for shared memory. @@ -769,8 +769,8 @@ TEST_F(MessageQueueTest, GetSharedMemory) { } }; - RunTests(1, TimeDelta::FromSeconds(1), - scoped_ptr<Provider>(new Provider()).get()); + Provider provider; + RunTests(1, TimeDelta::FromSeconds(1), &provider); } // Tests a request to update a texture. @@ -844,8 +844,8 @@ TEST_F(MessageQueueTest, UpdateTexture2D) { ASSERT_TRUE(texture != NULL); - RunTests(1, TimeDelta::FromSeconds(1), - scoped_ptr<Provider>(new Provider(texture->id())).get()); + Provider provider(texture->id()); + RunTests(1, TimeDelta::FromSeconds(1), &provider); } // This helper class is used for both single-threaded and concurrent @@ -907,8 +907,8 @@ TEST_F(MessageQueueTest, RegisterAndUnregisterSharedMemory) { } }; - RunTests(1, TimeDelta::FromSeconds(1), - scoped_ptr<Provider>(new Provider()).get()); + Provider provider; + RunTests(1, TimeDelta::FromSeconds(1), &provider); } // Tests that multiple concurrent clients of the MessageQueue don't @@ -921,8 +921,8 @@ TEST_F(MessageQueueTest, ConcurrentSharedMemoryOperations) { } }; - RunTests(2, TimeDelta::FromSeconds(6), - scoped_ptr<Provider>(new Provider()).get()); + Provider provider; + RunTests(2, TimeDelta::FromSeconds(6), &provider); } } // namespace o3d |