Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Gr...

webkit/glue/plugins/pepper_url_request_info.cc

Index: webkit/glue/plugins/pepper_url_request_info.cc
===================================================================
--- webkit/glue/plugins/pepper_url_request_info.cc	(revision 57791)
+++ webkit/glue/plugins/pepper_url_request_info.cc	(working copy)
@@ -62,7 +62,7 @@
 }
 
 bool SetProperty(PP_Resource request_id,
-                 PP_URLRequestProperty property,
+                 PP_URLRequestProperty_Dev property,
                  PP_Var var) {
   scoped_refptr<URLRequestInfo> request(
       Resource::GetAs<URLRequestInfo>(request_id));
@@ -111,7 +111,7 @@
                                    expected_last_modified_time);
 }
 
-const PPB_URLRequestInfo ppb_urlrequestinfo = {
+const PPB_URLRequestInfo_Dev ppb_urlrequestinfo = {
   &Create,
   &IsURLRequestInfo,
   &SetProperty,
@@ -130,11 +130,11 @@
 }
 
 // static
-const PPB_URLRequestInfo* URLRequestInfo::GetInterface() {
+const PPB_URLRequestInfo_Dev* URLRequestInfo::GetInterface() {
   return &ppb_urlrequestinfo;
 }
 
-bool URLRequestInfo::SetBooleanProperty(PP_URLRequestProperty property,
+bool URLRequestInfo::SetBooleanProperty(PP_URLRequestProperty_Dev property,
                                         bool value) {
   switch (property) {
     case PP_URLREQUESTPROPERTY_STREAMTOFILE:
@@ -146,7 +146,7 @@
   }
 }
 
-bool URLRequestInfo::SetStringProperty(PP_URLRequestProperty property,
+bool URLRequestInfo::SetStringProperty(PP_URLRequestProperty_Dev property,
                                        const std::string& value) {
   // TODO(darin): Validate input.  Perhaps at a different layer?
   switch (property) {