Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: components/nacl/loader/nacl_ipc_adapter_unittest.cc

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/nacl/loader/nacl_ipc_adapter.h ('k') | components/nacl/loader/nacl_listener.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/nacl/loader/nacl_ipc_adapter.h" 5 #include "components/nacl/loader/nacl_ipc_adapter.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/message_loop/message_loop_proxy.h" 11 #include "base/message_loop/message_loop_proxy.h"
12 #include "base/threading/platform_thread.h" 12 #include "base/threading/platform_thread.h"
13 #include "base/threading/simple_thread.h" 13 #include "base/threading/simple_thread.h"
14 #include "ipc/ipc_test_sink.h" 14 #include "ipc/ipc_test_sink.h"
15 #include "native_client/src/trusted/desc/nacl_desc_custom.h" 15 #include "native_client/src/trusted/desc/nacl_desc_custom.h"
16 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" 16 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
17 #include "ppapi/c/ppb_file_io.h" 17 #include "ppapi/c/ppb_file_io.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 namespace { 20 namespace {
21 21
22 class NaClIPCAdapterTest : public testing::Test { 22 class NaClIPCAdapterTest : public testing::Test {
23 public: 23 public:
24 NaClIPCAdapterTest() {} 24 NaClIPCAdapterTest() {}
25 25
26 // testing::Test implementation. 26 // testing::Test implementation.
27 virtual void SetUp() OVERRIDE { 27 virtual void SetUp() override {
28 sink_ = new IPC::TestSink; 28 sink_ = new IPC::TestSink;
29 29
30 // Takes ownership of the sink_ pointer. Note we provide the current message 30 // Takes ownership of the sink_ pointer. Note we provide the current message
31 // loop instead of using a real IO thread. This should work OK since we do 31 // loop instead of using a real IO thread. This should work OK since we do
32 // not need real IPC for the tests. 32 // not need real IPC for the tests.
33 adapter_ = new NaClIPCAdapter(scoped_ptr<IPC::Channel>(sink_), 33 adapter_ = new NaClIPCAdapter(scoped_ptr<IPC::Channel>(sink_),
34 base::MessageLoopProxy::current().get()); 34 base::MessageLoopProxy::current().get());
35 } 35 }
36 virtual void TearDown() OVERRIDE { 36 virtual void TearDown() override {
37 sink_ = NULL; // This pointer is actually owned by the IPCAdapter. 37 sink_ = NULL; // This pointer is actually owned by the IPCAdapter.
38 adapter_ = NULL; 38 adapter_ = NULL;
39 // The adapter destructor has to post a task to destroy the Channel on the 39 // The adapter destructor has to post a task to destroy the Channel on the
40 // IO thread. For the purposes of the test, we just need to make sure that 40 // IO thread. For the purposes of the test, we just need to make sure that
41 // task gets run, or it will appear as a leak. 41 // task gets run, or it will appear as a leak.
42 message_loop_.RunUntilIdle(); 42 message_loop_.RunUntilIdle();
43 } 43 }
44 44
45 protected: 45 protected:
46 int BlockingReceive(void* buf, size_t buf_size) { 46 int BlockingReceive(void* buf, size_t buf_size) {
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // handler. This should wake up any waiting threads and immediately return 272 // handler. This should wake up any waiting threads and immediately return
273 // -1. There is an inherent race condition in that we can't be sure if the 273 // -1. There is an inherent race condition in that we can't be sure if the
274 // other thread is actually waiting when this happens. This is OK, since the 274 // other thread is actually waiting when this happens. This is OK, since the
275 // behavior (which we also explicitly test later) is to return -1 if the 275 // behavior (which we also explicitly test later) is to return -1 if the
276 // channel has already had an error when you start waiting. 276 // channel has already had an error when you start waiting.
277 class MyThread : public base::SimpleThread { 277 class MyThread : public base::SimpleThread {
278 public: 278 public:
279 explicit MyThread(NaClIPCAdapter* adapter) 279 explicit MyThread(NaClIPCAdapter* adapter)
280 : SimpleThread("NaClIPCAdapterThread"), 280 : SimpleThread("NaClIPCAdapterThread"),
281 adapter_(adapter) {} 281 adapter_(adapter) {}
282 virtual void Run() OVERRIDE { 282 virtual void Run() override {
283 base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); 283 base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
284 adapter_->OnChannelError(); 284 adapter_->OnChannelError();
285 } 285 }
286 private: 286 private:
287 scoped_refptr<NaClIPCAdapter> adapter_; 287 scoped_refptr<NaClIPCAdapter> adapter_;
288 }; 288 };
289 MyThread thread(adapter_.get()); 289 MyThread thread(adapter_.get());
290 290
291 // IMPORTANT: do not return early from here down (including ASSERT_*) because 291 // IMPORTANT: do not return early from here down (including ASSERT_*) because
292 // the thread needs to joined or it will assert. 292 // the thread needs to joined or it will assert.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 EXPECT_EQ(NACL_ABI_O_RDONLY, 348 EXPECT_EQ(NACL_ABI_O_RDONLY,
349 TranslatePepperFileReadWriteOpenFlagsForTesting( 349 TranslatePepperFileReadWriteOpenFlagsForTesting(
350 PP_FILEOPENFLAG_CREATE)); 350 PP_FILEOPENFLAG_CREATE));
351 EXPECT_EQ(NACL_ABI_O_RDONLY, 351 EXPECT_EQ(NACL_ABI_O_RDONLY,
352 TranslatePepperFileReadWriteOpenFlagsForTesting( 352 TranslatePepperFileReadWriteOpenFlagsForTesting(
353 PP_FILEOPENFLAG_TRUNCATE)); 353 PP_FILEOPENFLAG_TRUNCATE));
354 EXPECT_EQ(NACL_ABI_O_RDONLY, 354 EXPECT_EQ(NACL_ABI_O_RDONLY,
355 TranslatePepperFileReadWriteOpenFlagsForTesting( 355 TranslatePepperFileReadWriteOpenFlagsForTesting(
356 PP_FILEOPENFLAG_EXCLUSIVE)); 356 PP_FILEOPENFLAG_EXCLUSIVE));
357 } 357 }
OLDNEW
« no previous file with comments | « components/nacl/loader/nacl_ipc_adapter.h ('k') | components/nacl/loader/nacl_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698