| Index: base/message_loop/message_loop_proxy_impl_unittest.cc
|
| diff --git a/base/message_loop_proxy_impl_unittest.cc b/base/message_loop/message_loop_proxy_impl_unittest.cc
|
| similarity index 73%
|
| rename from base/message_loop_proxy_impl_unittest.cc
|
| rename to base/message_loop/message_loop_proxy_impl_unittest.cc
|
| index e120b39b2105999c5de1df750e61160a65230fe1..4c88887c23185d12f3111368e185251f40950150 100644
|
| --- a/base/message_loop_proxy_impl_unittest.cc
|
| +++ b/base/message_loop/message_loop_proxy_impl_unittest.cc
|
| @@ -2,16 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/message_loop_proxy_impl.h"
|
| +#include "base/message_loop/message_loop_proxy_impl.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop.h"
|
| -#include "base/message_loop_proxy.h"
|
| +#include "base/message_loop/message_loop_proxy.h"
|
| #include "base/threading/thread.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "testing/platform_test.h"
|
|
|
| +namespace base {
|
|
|
| class MessageLoopProxyImplTest : public testing::Test {
|
| public:
|
| @@ -27,19 +28,19 @@ class MessageLoopProxyImplTest : public testing::Test {
|
| void AssertOnIOThread() const {
|
| ASSERT_TRUE(io_thread_->message_loop_proxy()->BelongsToCurrentThread());
|
| ASSERT_EQ(io_thread_->message_loop_proxy(),
|
| - base::MessageLoopProxy::current());
|
| + MessageLoopProxy::current());
|
| }
|
|
|
| void AssertOnFileThread() const {
|
| ASSERT_TRUE(file_thread_->message_loop_proxy()->BelongsToCurrentThread());
|
| ASSERT_EQ(file_thread_->message_loop_proxy(),
|
| - base::MessageLoopProxy::current());
|
| + MessageLoopProxy::current());
|
| }
|
|
|
| protected:
|
| virtual void SetUp() OVERRIDE {
|
| - io_thread_.reset(new base::Thread("MessageLoopProxyImplTest_IO"));
|
| - file_thread_.reset(new base::Thread("MessageLoopProxyImplTest_File"));
|
| + io_thread_.reset(new Thread("MessageLoopProxyImplTest_IO"));
|
| + file_thread_.reset(new Thread("MessageLoopProxyImplTest_File"));
|
| io_thread_->Start();
|
| file_thread_->Start();
|
| }
|
| @@ -71,8 +72,8 @@ class MessageLoopProxyImplTest : public testing::Test {
|
| MessageLoopProxyImplTest* test_;
|
| };
|
|
|
| - scoped_ptr<base::Thread> io_thread_;
|
| - scoped_ptr<base::Thread> file_thread_;
|
| + scoped_ptr<Thread> io_thread_;
|
| + scoped_ptr<Thread> file_thread_;
|
|
|
| private:
|
| mutable MessageLoop loop_;
|
| @@ -92,35 +93,37 @@ TEST_F(MessageLoopProxyImplTest, Delete) {
|
|
|
| TEST_F(MessageLoopProxyImplTest, PostTask) {
|
| EXPECT_TRUE(file_thread_->message_loop_proxy()->PostTask(
|
| - FROM_HERE, base::Bind(&MessageLoopProxyImplTest::BasicFunction,
|
| - base::Unretained(this))));
|
| + FROM_HERE, Bind(&MessageLoopProxyImplTest::BasicFunction,
|
| + Unretained(this))));
|
| MessageLoop::current()->Run();
|
| }
|
|
|
| TEST_F(MessageLoopProxyImplTest, PostTaskAfterThreadExits) {
|
| - scoped_ptr<base::Thread> test_thread(
|
| - new base::Thread("MessageLoopProxyImplTest_Dummy"));
|
| + scoped_ptr<Thread> test_thread(
|
| + new Thread("MessageLoopProxyImplTest_Dummy"));
|
| test_thread->Start();
|
| - scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
|
| + scoped_refptr<MessageLoopProxy> message_loop_proxy =
|
| test_thread->message_loop_proxy();
|
| test_thread->Stop();
|
|
|
| bool ret = message_loop_proxy->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&MessageLoopProxyImplTest::AssertNotRun));
|
| + Bind(&MessageLoopProxyImplTest::AssertNotRun));
|
| EXPECT_FALSE(ret);
|
| }
|
|
|
| TEST_F(MessageLoopProxyImplTest, PostTaskAfterThreadIsDeleted) {
|
| - scoped_refptr<base::MessageLoopProxy> message_loop_proxy;
|
| + scoped_refptr<MessageLoopProxy> message_loop_proxy;
|
| {
|
| - scoped_ptr<base::Thread> test_thread(
|
| - new base::Thread("MessageLoopProxyImplTest_Dummy"));
|
| + scoped_ptr<Thread> test_thread(
|
| + new Thread("MessageLoopProxyImplTest_Dummy"));
|
| test_thread->Start();
|
| message_loop_proxy = test_thread->message_loop_proxy();
|
| }
|
| bool ret = message_loop_proxy->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&MessageLoopProxyImplTest::AssertNotRun));
|
| + Bind(&MessageLoopProxyImplTest::AssertNotRun));
|
| EXPECT_FALSE(ret);
|
| }
|
| +
|
| +} // namespace base
|
|
|