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

Side by Side Diff: ipc/mojo/ipc_mojo_perftest.cc

Issue 669953003: Revert of Standardize usage of virtual/override/final in ipc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « ipc/mojo/ipc_mojo_bootstrap_unittest.cc ('k') | ipc/sync_socket_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/lazy_instance.h" 5 #include "base/lazy_instance.h"
6 #include "ipc/ipc_perftest_support.h" 6 #include "ipc/ipc_perftest_support.h"
7 #include "ipc/mojo/ipc_channel_mojo.h" 7 #include "ipc/mojo/ipc_channel_mojo.h"
8 #include "ipc/mojo/ipc_channel_mojo_host.h" 8 #include "ipc/mojo/ipc_channel_mojo_host.h"
9 #include "mojo/edk/embedder/test_embedder.h" 9 #include "mojo/edk/embedder/test_embedder.h"
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 base::LazyInstance<MojoInitialier> g_mojo_initializer 23 base::LazyInstance<MojoInitialier> g_mojo_initializer
24 = LAZY_INSTANCE_INITIALIZER; 24 = LAZY_INSTANCE_INITIALIZER;
25 25
26 class MojoChannelPerfTest : public IPC::test::IPCChannelPerfTestBase { 26 class MojoChannelPerfTest : public IPC::test::IPCChannelPerfTestBase {
27 public: 27 public:
28 typedef IPC::test::IPCChannelPerfTestBase Super; 28 typedef IPC::test::IPCChannelPerfTestBase Super;
29 29
30 MojoChannelPerfTest(); 30 MojoChannelPerfTest();
31 31
32 scoped_ptr<IPC::ChannelFactory> CreateChannelFactory( 32 virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
33 const IPC::ChannelHandle& handle, 33 const IPC::ChannelHandle& handle,
34 base::TaskRunner* runner) override { 34 base::TaskRunner* runner) override {
35 host_.reset(new IPC::ChannelMojoHost(task_runner())); 35 host_.reset(new IPC::ChannelMojoHost(task_runner()));
36 return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(), 36 return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(),
37 handle); 37 handle);
38 } 38 }
39 39
40 bool DidStartClient() override { 40 virtual bool DidStartClient() override {
41 bool ok = IPCTestBase::DidStartClient(); 41 bool ok = IPCTestBase::DidStartClient();
42 DCHECK(ok); 42 DCHECK(ok);
43 host_->OnClientLaunched(client_process()); 43 host_->OnClientLaunched(client_process());
44 return ok; 44 return ok;
45 } 45 }
46 46
47 void set_io_thread_task_runner(base::TaskRunner* runner) { 47 void set_io_thread_task_runner(base::TaskRunner* runner) {
48 io_thread_task_runner_ = runner; 48 io_thread_task_runner_ = runner;
49 } 49 }
50 50
(...skipping 15 matching lines...) Expand all
66 TEST_F(MojoChannelPerfTest, ChannelProxyPingPong) { 66 TEST_F(MojoChannelPerfTest, ChannelProxyPingPong) {
67 RunTestChannelProxyPingPong(GetDefaultTestParams()); 67 RunTestChannelProxyPingPong(GetDefaultTestParams());
68 } 68 }
69 69
70 class MojoTestClient : public IPC::test::PingPongTestClient { 70 class MojoTestClient : public IPC::test::PingPongTestClient {
71 public: 71 public:
72 typedef IPC::test::PingPongTestClient SuperType; 72 typedef IPC::test::PingPongTestClient SuperType;
73 73
74 MojoTestClient(); 74 MojoTestClient();
75 75
76 scoped_ptr<IPC::Channel> CreateChannel(IPC::Listener* listener) override; 76 virtual scoped_ptr<IPC::Channel> CreateChannel(
77 IPC::Listener* listener) override;
77 }; 78 };
78 79
79 MojoTestClient::MojoTestClient() { 80 MojoTestClient::MojoTestClient() {
80 g_mojo_initializer.Get(); 81 g_mojo_initializer.Get();
81 } 82 }
82 83
83 scoped_ptr<IPC::Channel> MojoTestClient::CreateChannel( 84 scoped_ptr<IPC::Channel> MojoTestClient::CreateChannel(
84 IPC::Listener* listener) { 85 IPC::Listener* listener) {
85 return scoped_ptr<IPC::Channel>( 86 return scoped_ptr<IPC::Channel>(
86 IPC::ChannelMojo::Create(NULL, 87 IPC::ChannelMojo::Create(NULL,
87 IPCTestBase::GetChannelName("PerformanceClient"), 88 IPCTestBase::GetChannelName("PerformanceClient"),
88 IPC::Channel::MODE_CLIENT, 89 IPC::Channel::MODE_CLIENT,
89 listener)); 90 listener));
90 } 91 }
91 92
92 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(PerformanceClient) { 93 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(PerformanceClient) {
93 MojoTestClient client; 94 MojoTestClient client;
94 return client.RunMain(); 95 return client.RunMain();
95 } 96 }
96 97
97 } // namespace 98 } // namespace
OLDNEW
« no previous file with comments | « ipc/mojo/ipc_mojo_bootstrap_unittest.cc ('k') | ipc/sync_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698