Index: webkit/plugins/ppapi/ppb_url_request_info_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppb_url_request_info_impl.cc (revision 113419) |
+++ webkit/plugins/ppapi/ppb_url_request_info_impl.cc (working copy) |
@@ -49,7 +49,7 @@ |
PPB_URLRequestInfo_Impl::PPB_URLRequestInfo_Impl( |
PP_Instance instance, |
const PPB_URLRequestInfo_Data& data) |
- : URLRequestInfoImpl(instance, data) { |
+ : PPB_URLRequestInfo_Shared(instance, data) { |
} |
PPB_URLRequestInfo_Impl::~PPB_URLRequestInfo_Impl() { |
Property changes on: webkit/plugins/ppapi/ppb_url_request_info_impl.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |
Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_url_request_info_impl.cc:r3734-4217,4606-5108,5177-5263 |