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

Side by Side Diff: ipc/ipc_channel_unittest.cc

Issue 645623006: 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
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 virtual ~ChannelListenerWithOnConnectedSend() {} 149 ~ChannelListenerWithOnConnectedSend() override {}
150 150
151 virtual void OnChannelConnected(int32 peer_pid) override { 151 void OnChannelConnected(int32 peer_pid) override { SendNextMessage(); }
152 SendNextMessage();
153 }
154 }; 152 };
155 153
156 #if defined(OS_WIN) 154 #if defined(OS_WIN)
157 // Acting flakey in Windows. http://crbug.com/129595 155 // Acting flakey in Windows. http://crbug.com/129595
158 #define MAYBE_SendMessageInChannelConnected DISABLED_SendMessageInChannelConnect ed 156 #define MAYBE_SendMessageInChannelConnected DISABLED_SendMessageInChannelConnect ed
159 #else 157 #else
160 #define MAYBE_SendMessageInChannelConnected SendMessageInChannelConnected 158 #define MAYBE_SendMessageInChannelConnected SendMessageInChannelConnected
161 #endif 159 #endif
162 // This tests the case of a listener sending back an event in its 160 // This tests the case of a listener sending back an event in its
163 // OnChannelConnected handler. 161 // OnChannelConnected handler.
(...skipping 29 matching lines...) Expand all
193 &listener)); 191 &listener));
194 CHECK(channel->Connect()); 192 CHECK(channel->Connect());
195 listener.Init(channel.get()); 193 listener.Init(channel.get());
196 IPC::TestChannelListener::SendOneMessage(channel.get(), "hello from child"); 194 IPC::TestChannelListener::SendOneMessage(channel.get(), "hello from child");
197 195
198 base::MessageLoop::current()->Run(); 196 base::MessageLoop::current()->Run();
199 return 0; 197 return 0;
200 } 198 }
201 199
202 } // namespace 200 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698