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

Side by Side Diff: ppapi/proxy/ppapi_proxy_test.h

Issue 10014013: Add a hang monitor for Pepper plugins (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/host_dispatcher.cc ('k') | ppapi/proxy/ppapi_proxy_test.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 (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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/synchronization/waitable_event.h" 10 #include "base/synchronization/waitable_event.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 virtual base::WaitableEvent* GetShutdownEvent(); 191 virtual base::WaitableEvent* GetShutdownEvent();
192 192
193 private: 193 private:
194 base::MessageLoopProxy* ipc_message_loop_; // Weak 194 base::MessageLoopProxy* ipc_message_loop_; // Weak
195 base::WaitableEvent* shutdown_event_; // Weak 195 base::WaitableEvent* shutdown_event_; // Weak
196 196
197 DISALLOW_COPY_AND_ASSIGN(DelegateMock); 197 DISALLOW_COPY_AND_ASSIGN(DelegateMock);
198 }; 198 };
199 199
200 private: 200 private:
201 class MockSyncMessageStatusReceiver;
202
201 ppapi::TestGlobals host_globals_; 203 ppapi::TestGlobals host_globals_;
202 scoped_ptr<HostDispatcher> host_dispatcher_; 204 scoped_ptr<HostDispatcher> host_dispatcher_;
203 DelegateMock delegate_mock_; 205 DelegateMock delegate_mock_;
206
207 scoped_ptr<MockSyncMessageStatusReceiver> status_receiver_;
204 }; 208 };
205 209
206 class HostProxyTest : public HostProxyTestHarness, public testing::Test { 210 class HostProxyTest : public HostProxyTestHarness, public testing::Test {
207 public: 211 public:
208 HostProxyTest(); 212 HostProxyTest();
209 virtual ~HostProxyTest(); 213 virtual ~HostProxyTest();
210 214
211 // testing::Test implementation. 215 // testing::Test implementation.
212 virtual void SetUp(); 216 virtual void SetUp();
213 virtual void TearDown(); 217 virtual void TearDown();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // stopping the harnesses. 256 // stopping the harnesses.
253 ProxyTestHarnessBase* remote_harness_; 257 ProxyTestHarnessBase* remote_harness_;
254 ProxyTestHarnessBase* local_harness_; 258 ProxyTestHarnessBase* local_harness_;
255 259
256 base::WaitableEvent channel_created_; 260 base::WaitableEvent channel_created_;
257 base::WaitableEvent shutdown_event_; 261 base::WaitableEvent shutdown_event_;
258 }; 262 };
259 263
260 } // namespace proxy 264 } // namespace proxy
261 } // namespace ppapi 265 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/proxy/host_dispatcher.cc ('k') | ppapi/proxy/ppapi_proxy_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698