| Index: ppapi/shared_impl/thread_aware_callback_unittest.cc
|
| diff --git a/ppapi/shared_impl/thread_aware_callback_unittest.cc b/ppapi/shared_impl/thread_aware_callback_unittest.cc
|
| index 9e9189b0668a3337eac07a8f5490d97666483e58..7081daae5652e60f7a9096778b5b3c40f25664cf 100644
|
| --- a/ppapi/shared_impl/thread_aware_callback_unittest.cc
|
| +++ b/ppapi/shared_impl/thread_aware_callback_unittest.cc
|
| @@ -53,19 +53,19 @@ class ThreadAwareCallbackMultiThreadTest
|
| : public proxy::PluginProxyMultiThreadTest {
|
| public:
|
| ThreadAwareCallbackMultiThreadTest() : main_thread_callback_called_(false) {}
|
| - virtual ~ThreadAwareCallbackMultiThreadTest() {
|
| + ~ThreadAwareCallbackMultiThreadTest() override {
|
| CHECK(main_thread_callback_called_);
|
| }
|
|
|
| // proxy::PluginProxyMultiThreadTest implementation.
|
| - virtual void SetUpTestOnMainThread() override {
|
| + void SetUpTestOnMainThread() override {
|
| ProxyAutoLock auto_lock;
|
|
|
| main_thread_callback_.reset(
|
| ThreadAwareCallback<CallbackFunc>::Create(&MainThreadCallbackBody));
|
| }
|
|
|
| - virtual void SetUpTestOnSecondaryThread() override {
|
| + void SetUpTestOnSecondaryThread() override {
|
| {
|
| ProxyAutoLock auto_lock;
|
| main_thread_callback_->RunOnTargetThread(this);
|
| @@ -100,17 +100,17 @@ class ThreadAwareCallbackMultiThreadTest
|
| class ThreadAwareCallbackAbortTest : public proxy::PluginProxyMultiThreadTest {
|
| public:
|
| ThreadAwareCallbackAbortTest() {}
|
| - virtual ~ThreadAwareCallbackAbortTest() {}
|
| + ~ThreadAwareCallbackAbortTest() override {}
|
|
|
| // proxy::PluginProxyMultiThreadTest implementation.
|
| - virtual void SetUpTestOnMainThread() override {
|
| + void SetUpTestOnMainThread() override {
|
| ProxyAutoLock auto_lock;
|
|
|
| main_thread_callback_.reset(
|
| ThreadAwareCallback<CallbackFunc>::Create(&MainThreadCallbackBody));
|
| }
|
|
|
| - virtual void SetUpTestOnSecondaryThread() override {
|
| + void SetUpTestOnSecondaryThread() override {
|
| {
|
| ProxyAutoLock auto_lock;
|
| main_thread_message_loop_proxy_->PostTask(
|
|
|