| OLD | NEW |
| 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 "webkit/plugins/npapi/plugin_lib.h" | 5 #include "content/child/npapi/plugin_lib.h" |
| 6 | 6 |
| 7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 11 | 11 |
| 12 namespace webkit { | 12 namespace content { |
| 13 namespace npapi { | |
| 14 | 13 |
| 15 // Test the unloading of plugin libs. Bug http://crbug.com/46526 showed that | 14 // Test the unloading of plugin libs. Bug http://crbug.com/46526 showed that |
| 16 // if UnloadAllPlugins() simply iterates through the g_loaded_libs global | 15 // if UnloadAllPlugins() simply iterates through the g_loaded_libs global |
| 17 // variable, we can get a crash if no plugin libs were marked as always loaded. | 16 // variable, we can get a crash if no plugin libs were marked as always loaded. |
| 18 class PluginLibTest : public PluginLib { | 17 class PluginLibTest : public PluginLib { |
| 19 public: | 18 public: |
| 20 PluginLibTest() : PluginLib(WebPluginInfo()) {} | 19 PluginLibTest() : PluginLib(webkit::WebPluginInfo()) {} |
| 21 using PluginLib::Unload; | 20 using PluginLib::Unload; |
| 22 | 21 |
| 23 protected: | 22 protected: |
| 24 virtual ~PluginLibTest() {} | 23 virtual ~PluginLibTest() {} |
| 25 }; | 24 }; |
| 26 | 25 |
| 27 TEST(PluginLibLoading, UnloadAllPlugins) { | 26 TEST(PluginLibLoading, UnloadAllPlugins) { |
| 28 // For the creation of the g_loaded_libs global variable. | 27 // For the creation of the g_loaded_libs global variable. |
| 29 ASSERT_EQ(static_cast<PluginLibTest*>(NULL), | 28 ASSERT_EQ(static_cast<PluginLibTest*>(NULL), |
| 30 PluginLibTest::CreatePluginLib(base::FilePath())); | 29 PluginLibTest::CreatePluginLib(base::FilePath())); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 55 // Need to create it again, it should have been destroyed above. | 54 // Need to create it again, it should have been destroyed above. |
| 56 ASSERT_EQ(static_cast<PluginLibTest*>(NULL), | 55 ASSERT_EQ(static_cast<PluginLibTest*>(NULL), |
| 57 PluginLibTest::CreatePluginLib(base::FilePath())); | 56 PluginLibTest::CreatePluginLib(base::FilePath())); |
| 58 | 57 |
| 59 // Now try to manually Unload the only one and then UnloadAll. | 58 // Now try to manually Unload the only one and then UnloadAll. |
| 60 plugin_lib1 = new PluginLibTest(); | 59 plugin_lib1 = new PluginLibTest(); |
| 61 plugin_lib1->Unload(); | 60 plugin_lib1->Unload(); |
| 62 PluginLib::UnloadAllPlugins(); | 61 PluginLib::UnloadAllPlugins(); |
| 63 } | 62 } |
| 64 | 63 |
| 65 } // namespace npapi | 64 } // namespace content |
| 66 } // namespace webkit | |
| OLD | NEW |