Index: ppapi/cpp/url_request_info.cc |
=================================================================== |
--- ppapi/cpp/url_request_info.cc (revision 65458) |
+++ ppapi/cpp/url_request_info.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ppapi/cpp/dev/url_request_info_dev.h" |
+#include "ppapi/cpp/url_request_info.h" |
#include "ppapi/cpp/common.h" |
#include "ppapi/cpp/dev/file_ref_dev.h" |
@@ -11,37 +11,26 @@ |
namespace { |
-DeviceFuncs<PPB_URLRequestInfo_Dev> url_request_info_f( |
- PPB_URLREQUESTINFO_DEV_INTERFACE); |
+DeviceFuncs<PPB_URLRequestInfo> url_request_info_f( |
+ PPB_URLREQUESTINFO_INTERFACE); |
} // namespace |
namespace pp { |
-URLRequestInfo_Dev::URLRequestInfo_Dev() { |
+URLRequestInfo::URLRequestInfo() { |
if (!url_request_info_f) |
return; |
PassRefFromConstructor( |
url_request_info_f->Create(Module::Get()->pp_module())); |
} |
-URLRequestInfo_Dev::URLRequestInfo_Dev(const URLRequestInfo_Dev& other) |
+URLRequestInfo::URLRequestInfo(const URLRequestInfo& other) |
: Resource(other) { |
} |
-URLRequestInfo_Dev& URLRequestInfo_Dev::operator=( |
- const URLRequestInfo_Dev& other) { |
- URLRequestInfo_Dev copy(other); |
- swap(copy); |
- return *this; |
-} |
- |
-void URLRequestInfo_Dev::swap(URLRequestInfo_Dev& other) { |
- Resource::swap(other); |
-} |
- |
-bool URLRequestInfo_Dev::SetProperty(PP_URLRequestProperty_Dev property, |
- const Var& value) { |
+bool URLRequestInfo::SetProperty(PP_URLRequestProperty property, |
+ const Var& value) { |
if (!url_request_info_f) |
return false; |
return PPBoolToBool(url_request_info_f->SetProperty(pp_resource(), |
@@ -49,7 +38,7 @@ |
value.pp_var())); |
} |
-bool URLRequestInfo_Dev::AppendDataToBody(const char* data, uint32_t len) { |
+bool URLRequestInfo::AppendDataToBody(const char* data, uint32_t len) { |
if (!url_request_info_f) |
return false; |
return PPBoolToBool(url_request_info_f->AppendDataToBody(pp_resource(), |
@@ -57,9 +46,8 @@ |
len)); |
} |
-bool URLRequestInfo_Dev::AppendFileToBody( |
- const FileRef_Dev& file_ref, |
- PP_Time expected_last_modified_time) { |
+bool URLRequestInfo::AppendFileToBody(const FileRef_Dev& file_ref, |
+ PP_Time expected_last_modified_time) { |
if (!url_request_info_f) |
return false; |
return PPBoolToBool( |
@@ -70,7 +58,7 @@ |
expected_last_modified_time)); |
} |
-bool URLRequestInfo_Dev::AppendFileRangeToBody( |
+bool URLRequestInfo::AppendFileRangeToBody( |
const FileRef_Dev& file_ref, |
int64_t start_offset, |
int64_t length, |