Merge UrlRequest.java into ChromiumUrlRequest.java

components/cronet/android/chromium_url_request.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/cronet/android/org_chromium_net_UrlRequest.h"
+#include "components/cronet/android/chromium_url_request.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
 #include "components/cronet/android/url_request_adapter.h"
 #include "components/cronet/android/url_request_context_adapter.h"
-#include "jni/UrlRequest_jni.h"
+#include "jni/ChromiumUrlRequest_jni.h"
 #include "net/base/net_errors.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_response_headers.h"
 
 using base::android::ConvertUTF8ToJavaString;
 
 namespace cronet {
 namespace {
 
 net::RequestPriority ConvertRequestPriority(jint request_priority) {
@@ skipping 33 matching lines @@
 // A delegate of URLRequestAdapter that delivers callbacks to the Java layer.
 class JniURLRequestAdapterDelegate
     : public URLRequestAdapter::URLRequestAdapterDelegate {
  public:
   JniURLRequestAdapterDelegate(JNIEnv* env, jobject owner) {
     owner_ = env->NewGlobalRef(owner);
   }
 
   virtual void OnResponseStarted(URLRequestAdapter* request) OVERRIDE {
     JNIEnv* env = base::android::AttachCurrentThread();
-    cronet::Java_UrlRequest_onResponseStarted(env, owner_);
+    cronet::Java_ChromiumUrlRequest_onResponseStarted(env, owner_);
   }
 
   virtual void OnBytesRead(URLRequestAdapter* request) OVERRIDE {
     int bytes_read = request->bytes_read();
     if (bytes_read != 0) {
       JNIEnv* env = base::android::AttachCurrentThread();
       base::android::ScopedJavaLocalRef<jobject> java_buffer(
           env, env->NewDirectByteBuffer(request->Data(), bytes_read));
-      cronet::Java_UrlRequest_onBytesRead(env, owner_, java_buffer.obj());
+      cronet::Java_ChromiumUrlRequest_onBytesRead(
+          env, owner_, java_buffer.obj());
     }
   }
 
   virtual void OnRequestFinished(URLRequestAdapter* request) OVERRIDE {
     JNIEnv* env = base::android::AttachCurrentThread();
-    cronet::Java_UrlRequest_finish(env, owner_);
+    cronet::Java_ChromiumUrlRequest_finish(env, owner_);
   }
 
   virtual int ReadFromUploadChannel(net::IOBuffer* buf,
                                     int buf_length) OVERRIDE {
     JNIEnv* env = base::android::AttachCurrentThread();
     base::android::ScopedJavaLocalRef<jobject> java_buffer(
         env, env->NewDirectByteBuffer(buf->data(), buf_length));
-    jint bytes_read = cronet::Java_UrlRequest_readFromUploadChannel(
+    jint bytes_read = cronet::Java_ChromiumUrlRequest_readFromUploadChannel(
         env, owner_, java_buffer.obj());
     return bytes_read;
   }
 
  protected:
   virtual ~JniURLRequestAdapterDelegate() {
     JNIEnv* env = base::android::AttachCurrentThread();
     env->DeleteGlobalRef(owner_);
   }
 
  private:
   jobject owner_;
 
   DISALLOW_COPY_AND_ASSIGN(JniURLRequestAdapterDelegate);
 };
 
 }  // namespace
 
 // Explicitly register static JNI functions.
-bool UrlRequestRegisterJni(JNIEnv* env) { return RegisterNativesImpl(env); }
+bool ChromiumUrlRequestRegisterJni(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
 
 static jlong CreateRequestAdapter(JNIEnv* env,
                                   jobject object,
                                   jlong urlRequestContextAdapter,
                                   jstring url_string,
                                   jint priority) {
   URLRequestContextAdapter* context =
       reinterpret_cast<URLRequestContextAdapter*>(urlRequestContextAdapter);
   DCHECK(context != NULL);
 
@@ skipping 69 matching lines @@
                              jlong urlRequestAdapter,
                              jstring content_type,
                              jlong content_length) {
   URLRequestAdapter* request =
       reinterpret_cast<URLRequestAdapter*>(urlRequestAdapter);
   SetPostContentType(env, request, content_type);
 
   request->SetUploadChannel(env, content_length);
 }
 
-
 /* synchronized */
 static void Start(JNIEnv* env, jobject object, jlong urlRequestAdapter) {
   URLRequestAdapter* request =
       reinterpret_cast<URLRequestAdapter*>(urlRequestAdapter);
   if (request != NULL) {
     request->Start();
   }
 }
 
 /* synchronized */
@@ skipping 136 matching lines @@
     return;
 
   void* iter = NULL;
   std::string header_name;
   std::string header_value;
   while (headers->EnumerateHeaderLines(&iter, &header_name, &header_value)) {
     ScopedJavaLocalRef<jstring> name =
         ConvertUTF8ToJavaString(env, header_name);
     ScopedJavaLocalRef<jstring> value =
         ConvertUTF8ToJavaString(env, header_value);
-    Java_UrlRequest_onAppendResponseHeader(
+    Java_ChromiumUrlRequest_onAppendResponseHeader(
         env, object, headersMap, name.Release(), value.Release());
   }
 
   // Some implementations (notably HttpURLConnection) include a mapping for the
   // null key; in HTTP's case, this maps to the HTTP status line.
   ScopedJavaLocalRef<jstring> status_line =
       ConvertUTF8ToJavaString(env, headers->GetStatusLine());
-  Java_UrlRequest_onAppendResponseHeader(
+  Java_ChromiumUrlRequest_onAppendResponseHeader(
       env, object, headersMap, NULL, status_line.Release());
 }
 
 }  // namespace cronet