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

Side by Side Diff: ipc/ipc_channel_unittest.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, 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 | « ipc/ipc_channel_proxy_unittest.cc ('k') | ipc/ipc_forwarding_message_filter.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 EXPECT_TRUE(WaitForClientShutdown()); 139 EXPECT_TRUE(WaitForClientShutdown());
140 140
141 // Destroy the channel proxy before shutting down the thread. 141 // Destroy the channel proxy before shutting down the thread.
142 DestroyChannelProxy(); 142 DestroyChannelProxy();
143 thread.Stop(); 143 thread.Stop();
144 } 144 }
145 145
146 class ChannelListenerWithOnConnectedSend : public IPC::TestChannelListener { 146 class ChannelListenerWithOnConnectedSend : public IPC::TestChannelListener {
147 public: 147 public:
148 ChannelListenerWithOnConnectedSend() {} 148 ChannelListenerWithOnConnectedSend() {}
149 ~ChannelListenerWithOnConnectedSend() override {} 149 virtual ~ChannelListenerWithOnConnectedSend() {}
150 150
151 void OnChannelConnected(int32 peer_pid) override { SendNextMessage(); } 151 virtual void OnChannelConnected(int32 peer_pid) override {
152 SendNextMessage();
153 }
152 }; 154 };
153 155
154 #if defined(OS_WIN) 156 #if defined(OS_WIN)
155 // Acting flakey in Windows. http://crbug.com/129595 157 // Acting flakey in Windows. http://crbug.com/129595
156 #define MAYBE_SendMessageInChannelConnected DISABLED_SendMessageInChannelConnect ed 158 #define MAYBE_SendMessageInChannelConnected DISABLED_SendMessageInChannelConnect ed
157 #else 159 #else
158 #define MAYBE_SendMessageInChannelConnected SendMessageInChannelConnected 160 #define MAYBE_SendMessageInChannelConnected SendMessageInChannelConnected
159 #endif 161 #endif
160 // This tests the case of a listener sending back an event in its 162 // This tests the case of a listener sending back an event in its
161 // OnChannelConnected handler. 163 // OnChannelConnected handler.
(...skipping 29 matching lines...) Expand all
191 &listener)); 193 &listener));
192 CHECK(channel->Connect()); 194 CHECK(channel->Connect());
193 listener.Init(channel.get()); 195 listener.Init(channel.get());
194 IPC::TestChannelListener::SendOneMessage(channel.get(), "hello from child"); 196 IPC::TestChannelListener::SendOneMessage(channel.get(), "hello from child");
195 197
196 base::MessageLoop::current()->Run(); 198 base::MessageLoop::current()->Run();
197 return 0; 199 return 0;
198 } 200 }
199 201
200 } // namespace 202 } // namespace
OLDNEW
« no previous file with comments | « ipc/ipc_channel_proxy_unittest.cc ('k') | ipc/ipc_forwarding_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698