| 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 #define UNIT_TEST // To get the ShadowingAtExitManager. | 5 #define UNIT_TEST // To get the ShadowingAtExitManager. |
| 6 #include "base/at_exit.h" | 6 #include "base/at_exit.h" |
| 7 | 7 |
| 8 #include "webkit/plugins/npapi/test/plugin_thread_async_call_test.h" | 8 #include "content/test/plugin/plugin_thread_async_call_test.h" |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
| 14 #include "webkit/plugins/npapi/test/plugin_client.h" | 14 #include "content/test/plugin/plugin_client.h" |
| 15 | 15 |
| 16 namespace NPAPIClient { | 16 namespace NPAPIClient { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 // There are two plugin instances in this test. The long lived instance is used | 20 // There are two plugin instances in this test. The long lived instance is used |
| 21 // for reporting errors and signalling test completion. The short lived one is | 21 // for reporting errors and signalling test completion. The short lived one is |
| 22 // used to verify that async callbacks are not invoked after NPP_Destroy. | 22 // used to verify that async callbacks are not invoked after NPP_Destroy. |
| 23 PluginThreadAsyncCallTest* g_short_lived_instance; | 23 PluginThreadAsyncCallTest* g_short_lived_instance; |
| 24 PluginThreadAsyncCallTest* g_long_lived_instance; | 24 PluginThreadAsyncCallTest* g_long_lived_instance; |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 } | 108 } |
| 109 | 109 |
| 110 return NPERR_NO_ERROR; | 110 return NPERR_NO_ERROR; |
| 111 } | 111 } |
| 112 | 112 |
| 113 void PluginThreadAsyncCallTest::OnCallCompleted() { | 113 void PluginThreadAsyncCallTest::OnCallCompleted() { |
| 114 SignalTestCompleted(); | 114 SignalTestCompleted(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 } // namespace NPAPIClient | 117 } // namespace NPAPIClient |
| OLD | NEW |