Merge UrlRequest.java into ChromiumUrlRequest.java

components/cronet/android/chromium_url_request.h

Index: components/cronet/android/chromium_url_request.h
diff --git a/components/cronet/android/org_chromium_net_UrlRequest.h b/components/cronet/android/chromium_url_request.h
similarity index 66%
rename from components/cronet/android/org_chromium_net_UrlRequest.h
rename to components/cronet/android/chromium_url_request.h
index 9a8f3d97cd627c80ed6b52a153496f7a2ac51e7d..4296738358715f3f8e970e1273ec203f8261ddc3 100644
--- a/components/cronet/android/org_chromium_net_UrlRequest.h
+++ b/components/cronet/android/chromium_url_request.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_CRONET_ANDROID_URLREQUEST_H_
-#define COMPONENTS_CRONET_ANDROID_URLREQUEST_H_
+#ifndef COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_
+#define COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_
 
 #include <jni.h>
 
@@ -13,7 +13,7 @@ namespace cronet {
 // way that ensures they're always the same than their Java counterpart.
 enum UrlRequestPriority {
 #define DEFINE_REQUEST_PRIORITY(x, y) REQUEST_PRIORITY_##x = y,
-#include "components/cronet/android/org_chromium_net_UrlRequest_priority_list.h"
+#include "components/cronet/android/chromium_url_request_priority_list.h"
 #undef DEFINE_REQUEST_PRIORITY
 };
 
@@ -21,12 +21,12 @@ enum UrlRequestPriority {
 // way that ensures they're always the same than their Java counterpart.
 enum UrlRequestError {
 #define DEFINE_REQUEST_ERROR(x, y) REQUEST_ERROR_##x = y,
-#include "components/cronet/android/org_chromium_net_UrlRequest_error_list.h"
+#include "components/cronet/android/chromium_url_request_error_list.h"
 #undef DEFINE_REQUEST_ERROR
 };
 
-bool UrlRequestRegisterJni(JNIEnv* env);
+bool ChromiumUrlRequestRegisterJni(JNIEnv* env);
 
 }  // namespace cronet
 
-#endif  // COMPONENTS_CRONET_ANDROID_URLREQUEST_H_
+#endif  // COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_