Final step of the java_cpp_template -> java_cpp_enum migration.

This CL migrates the remaining gyp/gn rules away from the
java_cpp_template rule.

BUG=405532

Review URL: https://codereview.chromium.org/659493003

Cr-Commit-Position: refs/heads/master@{#300881}

4 files changed, 11 insertions, 11 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index a9115ae..6455234 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -58,7 +58,7 @@ import org.chromium.content_public.browser.NavigationHistory;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.ui.base.ActivityWindowAndroid;
-import org.chromium.ui.base.PageTransitionTypes;
+import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
@@ -1122,11 +1122,11 @@ public class AwContents {
         // If we are reloading the same url, then set transition type as reload.
         if (params.getUrl() != null &&
                 params.getUrl().equals(mWebContents.getUrl()) &&
-                params.getTransitionType() == PageTransitionTypes.PAGE_TRANSITION_LINK) {
-            params.setTransitionType(PageTransitionTypes.PAGE_TRANSITION_RELOAD);
+                params.getTransitionType() == PageTransition.LINK) {
+            params.setTransitionType(PageTransition.RELOAD);
         }
         params.setTransitionType(
-                params.getTransitionType() | PageTransitionTypes.PAGE_TRANSITION_FROM_API);
+                params.getTransitionType() | PageTransition.FROM_API);
 
         // For WebView, always use the user agent override, which is set
         // every time the user agent in AwSettings is modified.
diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk
index ec9ad69..c5259a2 100644
--- a/android_webview/java_library_common.mk
+++ b/android_webview/java_library_common.mk
@@ -56,11 +56,11 @@ $(call intermediates-dir-for,GYP,shared)/enums/selection_event_type_java/org/chr
 $(call intermediates-dir-for,GYP,shared)/enums/speech_recognition_error_java/org/chromium/content_public/common/SpeechRecognitionErrorCode.java \
 $(call intermediates-dir-for,GYP,shared)/enums/top_controls_state_java/org/chromium/content_public/common/TopControlsState.java \
 $(call intermediates-dir-for,GYP,shared)/enums/window_open_disposition_java/org/chromium/ui/WindowOpenDisposition.java \
-$(call intermediates-dir-for,GYP,shared)/templates/base_java_application_state/org/chromium/base/ApplicationState.java \
-$(call intermediates-dir-for,GYP,shared)/templates/base_java_memory_pressure_level_list/org/chromium/base/MemoryPressureLevelList.java \
-$(call intermediates-dir-for,GYP,shared)/templates/media_android_imageformat_list/org/chromium/media/AndroidImageFormat.java \
+$(call intermediates-dir-for,GYP,shared)/enums/base_java_application_state/org/chromium/base/ApplicationState.java \
+$(call intermediates-dir-for,GYP,shared)/enums/base_java_memory_pressure_level/org/chromium/base/MemoryPressureLevel.java \
+$(call intermediates-dir-for,GYP,shared)/enums/media_android_imageformat/org/chromium/media/AndroidImageFormat.java \
+$(call intermediates-dir-for,GYP,shared)/enums/page_transition_types_java/org/chromium/ui/base/PageTransition.java \
 $(call intermediates-dir-for,GYP,shared)/templates/net_errors_java/org/chromium/net/NetError.java \
-$(call intermediates-dir-for,GYP,shared)/templates/page_transition_types_java/org/chromium/ui/base/PageTransitionTypes.java \
 
 # content dependencies on java components that are provided by the system on
 # android
diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi
index 3d87388..50ff746 100644
--- a/android_webview/libwebviewchromium.gypi
+++ b/android_webview/libwebviewchromium.gypi
@@ -14,7 +14,7 @@
       # android_webview_java in android_webview/java_library_common.mk.
       'dependencies': [
         '../base/base.gyp:base_java_application_state',
-        '../base/base.gyp:base_java_memory_pressure_level_list',
+        '../base/base.gyp:base_java_memory_pressure_level',
         '../content/content.gyp:content_gamepad_mapping',
         '../content/content.gyp:gesture_event_type_java',
         '../content/content.gyp:popup_item_type_java',
@@ -23,7 +23,7 @@
         '../content/content.gyp:selection_event_type_java',
         '../content/content.gyp:speech_recognition_error_java',
         '../content/content.gyp:top_controls_state_java',
-        '../media/media.gyp:media_android_imageformat_list',
+        '../media/media.gyp:media_android_imageformat',
         '../net/net.gyp:cert_verify_status_android_java',
         '../net/net.gyp:certificate_mime_types_java',
         '../net/net.gyp:net_errors_java',
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index eac4600..fb7b2e4 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -279,7 +279,7 @@ AwContents::~AwContents() {
   // without ever using another WebView.
   if (base::subtle::NoBarrier_Load(&g_instance_count) == 0) {
     base::MemoryPressureListener::NotifyMemoryPressure(
-        base::MemoryPressureListener::MEMORY_PRESSURE_CRITICAL);
+        base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
   }
 }