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

Unified Diff: content/child/npapi/plugin_lib_unittest.cc

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698