Revert 93223 - Reland http://codereview.chromium.org/7452002/

Update chromoting input events. (Clang caught this. Thanks, Clang!)

Note I'm leaving in temporary backwards-compatibility.

brettw, just need a rubber-stamp. This is the same as the last CL. awong/garykac/sergeyu, looking for someone on chromoting team to glance at my changes and make sure I didn't do anything you don't like. This is a high priority for 14, so please look if you can.

BUG=None
TEST=ppapi tests

Review URL: http://codereview.chromium.org/7466002

TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/7471006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93229 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 13 deletions

diff --git a/ppapi/shared_impl/ppp_instance_combined.cc b/ppapi/shared_impl/ppp_instance_combined.cc
index ffb96a4..ce3d2c4 100644
--- a/ppapi/shared_impl/ppp_instance_combined.cc
+++ b/ppapi/shared_impl/ppp_instance_combined.cc
@@ -7,20 +7,8 @@
 namespace ppapi {
 
 PPP_Instance_Combined::PPP_Instance_Combined(
-    const PPP_Instance_1_0& instance_if)
-    : PPP_Instance_1_0(instance_if),
-      HandleInputEvent_0_5(NULL) {
-}
-
-PPP_Instance_Combined::PPP_Instance_Combined(
     const PPP_Instance_0_5& instance_if)
-    : PPP_Instance_1_0(),
-      HandleInputEvent_0_5(instance_if.HandleInputEvent) {
-  DidCreate = instance_if.DidCreate;
-  DidDestroy = instance_if.DidDestroy;
-  DidChangeView = instance_if.DidChangeView;
-  DidChangeFocus = instance_if.DidChangeFocus;
-  HandleDocumentLoad = instance_if.HandleDocumentLoad;
+    : PPP_Instance_0_5(instance_if) {
 }
 
 }  // namespace ppapi