| Index: content/child/npapi/plugin_lib_unittest.cc
|
| ===================================================================
|
| --- content/child/npapi/plugin_lib_unittest.cc (revision 0)
|
| +++ content/child/npapi/plugin_lib_unittest.cc (working copy)
|
| @@ -2,22 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/plugins/npapi/plugin_lib.h"
|
| +#include "content/child/npapi/plugin_lib.h"
|
|
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace webkit {
|
| -namespace npapi {
|
| +namespace content {
|
|
|
| // Test the unloading of plugin libs. Bug http://crbug.com/46526 showed that
|
| // if UnloadAllPlugins() simply iterates through the g_loaded_libs global
|
| // variable, we can get a crash if no plugin libs were marked as always loaded.
|
| class PluginLibTest : public PluginLib {
|
| public:
|
| - PluginLibTest() : PluginLib(WebPluginInfo()) {}
|
| + PluginLibTest() : PluginLib(webkit::WebPluginInfo()) {}
|
| using PluginLib::Unload;
|
|
|
| protected:
|
| @@ -62,5 +61,4 @@
|
| PluginLib::UnloadAllPlugins();
|
| }
|
|
|
| -} // namespace npapi
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|