| Index: remoting/client/plugin/chromoting_plugin.h
 | 
| diff --git a/remoting/client/plugin/chromoting_plugin.h b/remoting/client/plugin/chromoting_plugin.h
 | 
| index d19b6122e511fdca28af44eef73129725c8b22cc..757e038c3bfa4199766faa9e9f043a429b3ba900 100644
 | 
| --- a/remoting/client/plugin/chromoting_plugin.h
 | 
| +++ b/remoting/client/plugin/chromoting_plugin.h
 | 
| @@ -11,8 +11,11 @@
 | 
|  #include "base/scoped_ptr.h"
 | 
|  #include "remoting/client/host_connection.h"
 | 
|  #include "testing/gtest/include/gtest/gtest_prod.h"
 | 
| -#include "third_party/ppapi/cpp/device_context_2d.h"
 | 
| -#include "third_party/ppapi/cpp/instance.h"
 | 
| +#include "third_party/ppapi/c/pp_event.h"
 | 
| +#include "third_party/ppapi/c/pp_instance.h"
 | 
| +#include "third_party/ppapi/c/pp_rect.h"
 | 
| +#include "third_party/ppapi/c/pp_resource.h"
 | 
| +#include "third_party/ppapi/c/ppb_instance.h"
 | 
|  
 | 
|  namespace base {
 | 
|  class Thread;
 | 
| @@ -27,7 +30,7 @@ class PepperView;
 | 
|  
 | 
|  class ChromotingClient;
 | 
|  
 | 
| -class ChromotingPlugin : public pp::Instance {
 | 
| +class ChromotingPlugin {
 | 
|   public:
 | 
|    // The mimetype for which this plugin is registered.
 | 
|    //
 | 
| @@ -35,7 +38,7 @@ class ChromotingPlugin : public pp::Instance {
 | 
|    // point.  I think we should handle a special protocol (eg., chromotocol://)
 | 
|    static const char *kMimeType;
 | 
|  
 | 
| -  ChromotingPlugin(PP_Instance instance);
 | 
| +  ChromotingPlugin(PP_Instance instance, const PPB_Instance* instance_funcs);
 | 
|    virtual ~ChromotingPlugin();
 | 
|  
 | 
|    virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
 | 
| @@ -55,7 +58,10 @@ class ChromotingPlugin : public pp::Instance {
 | 
|    int width_;
 | 
|    int height_;
 | 
|  
 | 
| -  pp::DeviceContext2D device_context_;
 | 
| +  PP_Resource drawing_context_;
 | 
| +
 | 
| +  PP_Instance pp_instance_;
 | 
| +  const PPB_Instance* ppb_instance_funcs_;
 | 
|  
 | 
|    scoped_ptr<base::Thread> main_thread_;
 | 
|    scoped_ptr<JingleThread> network_thread_;
 | 
| 
 |