OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ppapi/proxy/ppapi_proxy_test.h" | 5 #include "ppapi/proxy/ppapi_proxy_test.h" |
6 | 6 |
7 #include "base/message_loop_proxy.h" | 7 #include "base/message_loop_proxy.h" |
8 #include "base/observer_list.h" | 8 #include "base/observer_list.h" |
9 #include "ipc/ipc_sync_channel.h" | 9 #include "ipc/ipc_sync_channel.h" |
10 #include "ppapi/c/pp_errors.h" | 10 #include "ppapi/c/pp_errors.h" |
11 #include "ppapi/c/private/ppb_proxy_private.h" | 11 #include "ppapi/c/private/ppb_proxy_private.h" |
12 #include "ppapi/proxy/ppapi_messages.h" | 12 #include "ppapi/proxy/ppapi_messages.h" |
13 #include "ppapi/shared_impl/ppapi_preferences.cc" | |
14 | 13 |
15 namespace ppapi { | 14 namespace ppapi { |
16 namespace proxy { | 15 namespace proxy { |
17 | 16 |
18 namespace { | 17 namespace { |
19 // HostDispatcher requires a PPB_Proxy_Private, so we always provide a fallback | 18 // HostDispatcher requires a PPB_Proxy_Private, so we always provide a fallback |
20 // do-nothing implementation. | 19 // do-nothing implementation. |
21 void PluginCrashed(PP_Module module) { | 20 void PluginCrashed(PP_Module module) { |
22 NOTREACHED(); | 21 NOTREACHED(); |
23 }; | 22 }; |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 remote_harness_torn_down.Wait(); | 368 remote_harness_torn_down.Wait(); |
370 | 369 |
371 local_harness_->TearDownHarness(); | 370 local_harness_->TearDownHarness(); |
372 | 371 |
373 io_thread_.Stop(); | 372 io_thread_.Stop(); |
374 } | 373 } |
375 | 374 |
376 | 375 |
377 } // namespace proxy | 376 } // namespace proxy |
378 } // namespace ppapi | 377 } // namespace ppapi |
OLD | NEW |