Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/common/android/resource_request_body_android.cc

Index: content/common/android/resource_request_body_android.cc
diff --git a/content/common/android/resource_request_body_android.cc b/content/common/android/resource_request_body_android.cc
index 7abf4e8ceeba8787f4e0966563ed98c4a0d57b0a..08e747a38da1d96fbd1e7bde9e979a94b8ca5f9a 100644
--- a/content/common/android/resource_request_body_android.cc
+++ b/content/common/android/resource_request_body_android.cc
@@ -23,7 +23,7 @@ namespace {
 
 base::android::ScopedJavaLocalRef<jbyteArray>
 ConvertResourceRequestBodyToJavaArray(JNIEnv* env,
-                                      const ResourceRequestBodyImpl& body) {
+                                      const ResourceRequestBody& body) {
   std::string encoded = EncodeResourceRequestBody(body);
   return base::android::ToJavaByteArray(
       env, reinterpret_cast<const uint8_t*>(encoded.data()), encoded.size());
@@ -51,13 +51,13 @@ CreateResourceRequestBodyFromBytes(
           reinterpret_cast<const char*>(post_data.data()), post_data.size());
 
   return ConvertResourceRequestBodyToJavaArray(
-      env, static_cast<const ResourceRequestBodyImpl&>(*body));
+      env, static_cast<const ResourceRequestBody&>(*body));
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 ConvertResourceRequestBodyToJavaObject(
     JNIEnv* env,
-    const scoped_refptr<ResourceRequestBodyImpl>& body) {
+    const scoped_refptr<ResourceRequestBody>& body) {
   if (!body)
     return base::android::ScopedJavaLocalRef<jobject>();
 
@@ -69,7 +69,7 @@ ConvertResourceRequestBodyToJavaObject(
   return Java_ResourceRequestBody_createFromEncodedNativeForm(env, j_encoded);
 }
 
-scoped_refptr<ResourceRequestBodyImpl> ExtractResourceRequestBodyFromJavaObject(
+scoped_refptr<ResourceRequestBody> ExtractResourceRequestBodyFromJavaObject(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& j_body) {
   if (!j_body)