| Index: chrome/renderer/pepper/pepper_extensions_common_host.h
 | 
| diff --git a/chrome/renderer/pepper/pepper_extensions_common_host.h b/chrome/renderer/pepper/pepper_extensions_common_host.h
 | 
| index 2dfb376d3bca2fa28d71bb903211b7dd3aaf70a0..9754d1b9affbd53ee6b1202dc0f4a0468f2976a1 100644
 | 
| --- a/chrome/renderer/pepper/pepper_extensions_common_host.h
 | 
| +++ b/chrome/renderer/pepper/pepper_extensions_common_host.h
 | 
| @@ -9,9 +9,11 @@
 | 
|  #include <string>
 | 
|  
 | 
|  #include "base/basictypes.h"
 | 
| +#include "base/bind.h"
 | 
|  #include "base/compiler_specific.h"
 | 
|  #include "base/memory/linked_ptr.h"
 | 
| -#include "chrome/renderer/extensions/request_sender.h"
 | 
| +#include "base/memory/weak_ptr.h"
 | 
| +#include "chrome/renderer/extensions/pepper_request_proxy.h"
 | 
|  #include "ppapi/host/resource_host.h"
 | 
|  
 | 
|  namespace base {
 | 
| @@ -32,8 +34,7 @@ namespace extensions {
 | 
|  class Dispatcher;
 | 
|  }
 | 
|  
 | 
| -class PepperExtensionsCommonHost : public ppapi::host::ResourceHost,
 | 
| -                                   public extensions::RequestSender::Source {
 | 
| +class PepperExtensionsCommonHost : public ppapi::host::ResourceHost {
 | 
|   public:
 | 
|    virtual ~PepperExtensionsCommonHost();
 | 
|  
 | 
| @@ -46,21 +47,15 @@ class PepperExtensionsCommonHost : public ppapi::host::ResourceHost,
 | 
|        const IPC::Message& msg,
 | 
|        ppapi::host::HostMessageContext* context) OVERRIDE;
 | 
|  
 | 
| -  // extensions::RequestSender::Source implementation.
 | 
| -  virtual extensions::ChromeV8Context* GetContext() OVERRIDE;
 | 
| -  virtual void OnResponseReceived(const std::string& name,
 | 
| -                                  int request_id,
 | 
| -                                  bool success,
 | 
| -                                  const base::ListValue& response,
 | 
| -                                  const std::string& error) OVERRIDE;
 | 
|   private:
 | 
|    typedef std::map<int, linked_ptr<ppapi::host::ReplyMessageContext> >
 | 
|        PendingRequestMap;
 | 
|  
 | 
| -  PepperExtensionsCommonHost(content::RendererPpapiHost* host,
 | 
| -                             PP_Instance instance,
 | 
| -                             PP_Resource resource,
 | 
| -                             extensions::Dispatcher* dispatcher);
 | 
| +  PepperExtensionsCommonHost(
 | 
| +      content::RendererPpapiHost* host,
 | 
| +      PP_Instance instance,
 | 
| +      PP_Resource resource,
 | 
| +      extensions::PepperRequestProxy* pepper_request_proxy);
 | 
|  
 | 
|    int32_t OnPost(ppapi::host::HostMessageContext* context,
 | 
|                   const std::string& request_name,
 | 
| @@ -70,13 +65,22 @@ class PepperExtensionsCommonHost : public ppapi::host::ResourceHost,
 | 
|                   const std::string& request_name,
 | 
|                   base::ListValue& args);
 | 
|  
 | 
| +  void OnResponseReceived(int request_id,
 | 
| +                          bool success,
 | 
| +                          const base::ListValue& response,
 | 
| +                          const std::string& error);
 | 
| +
 | 
|    // Non-owning pointer.
 | 
|    content::RendererPpapiHost* renderer_ppapi_host_;
 | 
|    // Non-owning pointer.
 | 
| -  extensions::Dispatcher* dispatcher_;
 | 
| +  extensions::PepperRequestProxy* pepper_request_proxy_;
 | 
|  
 | 
|    PendingRequestMap pending_request_map_;
 | 
|  
 | 
| +  extensions::PepperRequestProxy::ResponseCallback callback_;
 | 
| +
 | 
| +  base::WeakPtrFactory<PepperExtensionsCommonHost> weak_factory_;
 | 
| +
 | 
|    DISALLOW_COPY_AND_ASSIGN(PepperExtensionsCommonHost);
 | 
|  };
 | 
|  
 | 
| 
 |