Merge UrlRequest.java into ChromiumUrlRequest.java

components/cronet/android/chromium_url_request_context.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_UrlRequestContext.h"
+#include "components/cronet/android/chromium_url_request_context.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/values.h"
-#include "components/cronet/android/org_chromium_net_UrlRequest.h"
+#include "components/cronet/android/chromium_url_request.h"
 #include "components/cronet/android/url_request_adapter.h"
 #include "components/cronet/android/url_request_context_adapter.h"
 #include "components/cronet/url_request_context_config.h"
-#include "jni/UrlRequestContext_jni.h"
+#include "jni/ChromiumUrlRequestContext_jni.h"
 
 namespace {
 
 // Delegate of URLRequestContextAdapter that delivers callbacks to the Java
 // layer.
 class JniURLRequestContextAdapterDelegate
     : public cronet::URLRequestContextAdapter::
           URLRequestContextAdapterDelegate {
  public:
   JniURLRequestContextAdapterDelegate(JNIEnv* env, jobject owner)
       : owner_(env->NewGlobalRef(owner)) {}
 
   virtual void OnContextInitialized(
       cronet::URLRequestContextAdapter* context) OVERRIDE {
     JNIEnv* env = base::android::AttachCurrentThread();
-    cronet::Java_UrlRequestContext_initNetworkThread(env, owner_);
+    cronet::Java_ChromiumUrlRequestContext_initNetworkThread(env, owner_);
     // TODO(dplotnikov): figure out if we need to detach from the thread.
     // The documentation says we should detach just before the thread exits.
   }
 
  protected:
   virtual ~JniURLRequestContextAdapterDelegate() {
     JNIEnv* env = base::android::AttachCurrentThread();
     env->DeleteGlobalRef(owner_);
   }
 
  private:
   jobject owner_;
 };
 
 }  // namespace
 
 namespace cronet {
 
 // Explicitly register static JNI functions.
-bool UrlRequestContextRegisterJni(JNIEnv* env) {
+bool ChromiumUrlRequestContextRegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // Sets global user-agent to be used for all subsequent requests.
 static jlong CreateRequestContextAdapter(JNIEnv* env,
                                          jobject object,
                                          jobject context,
                                          jstring user_agent,
                                          jint log_level,
                                          jstring config) {
@@ skipping 74 matching lines @@
 // Stops recording NetLog.
 static void StopNetLog(JNIEnv* env,
                        jobject jcaller,
                        jlong urlRequestContextAdapter) {
   URLRequestContextAdapter* adapter =
       reinterpret_cast<URLRequestContextAdapter*>(urlRequestContextAdapter);
   adapter->StopNetLog();
 }
 
 }  // namespace cronet