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

Unified Diff: webkit/plugins/ppapi/ppapi_unittest.cc

Issue 5828003: Move the Pepper implementation from webkit/glue/plugins/pepper_* to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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
« no previous file with comments | « webkit/plugins/ppapi/ppapi_unittest.h ('k') | webkit/plugins/ppapi/ppb_audio_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppapi_unittest.cc
===================================================================
--- webkit/plugins/ppapi/ppapi_unittest.cc (revision 0)
+++ webkit/plugins/ppapi/ppapi_unittest.cc (working copy)
@@ -2,20 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/glue/plugins/ppapi_unittest.h"
+#include "webkit/plugins/ppapi/ppapi_unittest.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppp_instance.h"
-#include "webkit/glue/plugins/mock_plugin_delegate.h"
-#include "webkit/glue/plugins/pepper_plugin_instance.h"
-#include "webkit/glue/plugins/pepper_plugin_module.h"
+#include "webkit/plugins/ppapi/mock_plugin_delegate.h"
+#include "webkit/plugins/ppapi/plugin_instance.h"
+#include "webkit/plugins/ppapi/plugin_module.h"
-namespace pepper {
+namespace webkit {
+namespace ppapi {
namespace {
PpapiUnittest* current_unittest = NULL;
-
+
const void* MockGetInterface(const char* interface_name) {
return current_unittest->GetMockInterface(interface_name);
}
@@ -24,8 +25,6 @@
return PP_OK;
}
-// PepperPluginDelegate -------------------------------------
-
// PPP_Instance implementation ------------------------------------------------
PP_Bool Instance_DidCreate(PP_Instance pp_instance,
@@ -86,14 +85,14 @@
void PpapiUnittest::SetUp() {
delegate_.reset(new MockPluginDelegate);
-
+
// Initialize the mock module.
module_ = new PluginModule;
PluginModule::EntryPoints entry_points;
entry_points.get_interface = &MockGetInterface;
entry_points.initialize_module = &MockInitializeModule;
ASSERT_TRUE(module_->InitAsInternalPlugin(entry_points));
-
+
// Initialize the mock instance.
instance_ = new PluginInstance(delegate_.get(), module(),
static_cast<const PPP_Instance*>(
@@ -109,5 +108,6 @@
return NULL;
}
-} // namespace pepper
+} // namespace ppapi
+} // namespace webkit
« no previous file with comments | « webkit/plugins/ppapi/ppapi_unittest.h ('k') | webkit/plugins/ppapi/ppb_audio_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698