Index: components/cronet/android/cronet_url_request.h |
diff --git a/components/cronet/android/chromium_url_request.h b/components/cronet/android/cronet_url_request.h |
similarity index 51% |
copy from components/cronet/android/chromium_url_request.h |
copy to components/cronet/android/cronet_url_request.h |
index 4296738358715f3f8e970e1273ec203f8261ddc3..0c4a795b6094a5abf54ca6efc991c91154325f83 100644 |
--- a/components/cronet/android/chromium_url_request.h |
+++ b/components/cronet/android/cronet_url_request.h |
@@ -2,31 +2,31 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_ |
-#define COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_ |
+#ifndef COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_ |
+#define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_ |
#include <jni.h> |
namespace cronet { |
-// Define request priority values like REQUEST_PRIORITY_IDLE in a |
+// Define request priority values like CRONET_REQUEST_PRIORITY_IDLE in a |
// way that ensures they're always the same than their Java counterpart. |
-enum UrlRequestPriority { |
-#define DEFINE_REQUEST_PRIORITY(x, y) REQUEST_PRIORITY_##x = y, |
+enum CronetUrlRequestPriority { |
mmenke
2014/10/20 21:07:29
As a reminder, there's a new way to do this.
mef
2014/10/21 14:49:11
Done.
|
+#define DEFINE_REQUEST_PRIORITY(x, y) CRONET_REQUEST_PRIORITY_##x = y, |
#include "components/cronet/android/chromium_url_request_priority_list.h" |
#undef DEFINE_REQUEST_PRIORITY |
}; |
-// Define request priority values like REQUEST_ERROR_SUCCESS in a |
+// Define request priority values like CRONET_REQUEST_ERROR_SUCCESS in a |
// way that ensures they're always the same than their Java counterpart. |
-enum UrlRequestError { |
-#define DEFINE_REQUEST_ERROR(x, y) REQUEST_ERROR_##x = y, |
+enum CronetUrlRequestError { |
+#define DEFINE_REQUEST_ERROR(x, y) CRONET_REQUEST_ERROR_##x = y, |
#include "components/cronet/android/chromium_url_request_error_list.h" |
#undef DEFINE_REQUEST_ERROR |
}; |
-bool ChromiumUrlRequestRegisterJni(JNIEnv* env); |
+bool CronetUrlRequestRegisterJni(JNIEnv* env); |
} // namespace cronet |
-#endif // COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_ |
+#endif // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_ |