Improve readability by moving const inside @IntDef ProcessType

Change-Id: Ife219da64894fd0d0ff0d299261a498b6f5eba76
Reviewed-on: https://chromium-review.googlesource.com/1125068
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572569}

chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java

@@ -60,14 +60,16 @@ public class MinidumpUploadService extends IntentService {
     private static final int FAILURE = 0;
     private static final int SUCCESS = 1;
 
-    @StringDef({BROWSER, RENDERER, GPU, OTHER})
-    public @interface ProcessType {}
-    static final String BROWSER = "Browser";
-    static final String RENDERER = "Renderer";
-    static final String GPU = "GPU";
-    static final String OTHER = "Other";
+    @StringDef({ProcessType.BROWSER, ProcessType.RENDERER, ProcessType.GPU, ProcessType.OTHER})
+    public @interface ProcessType {
+        String BROWSER = "Browser";
+        String RENDERER = "Renderer";
+        String GPU = "GPU";
+        String OTHER = "Other";
+    }
 
-    static final String[] TYPES = {BROWSER, RENDERER, GPU, OTHER};
+    static final String[] TYPES = {
+            ProcessType.BROWSER, ProcessType.RENDERER, ProcessType.GPU, ProcessType.OTHER};
 
     public MinidumpUploadService() {
         super(TAG);
@@ -217,23 +219,11 @@ public class MinidumpUploadService extends IntentService {
                     // Crash type is on the line after the next line.
                     fileReader.readLine();
                     String crashType = fileReader.readLine();
-                    if (crashType == null) {
-                        return OTHER;
-                    }
-
-                    if (crashType.equals("browser")) {
-                        return BROWSER;
-                    }
-
-                    if (crashType.equals("renderer")) {
-                        return RENDERER;
-                    }
-
-                    if (crashType.equals("gpu-process")) {
-                        return GPU;
-                    }
-
-                    return OTHER;
+                    if (crashType == null) return ProcessType.OTHER;
+                    if (crashType.equals("browser")) return ProcessType.BROWSER;
+                    if (crashType.equals("renderer")) return ProcessType.RENDERER;
+                    if (crashType.equals("gpu-process")) return ProcessType.GPU;
+                    return ProcessType.OTHER;
                 }
             }
         } catch (IOException e) {
@@ -241,7 +231,7 @@ public class MinidumpUploadService extends IntentService {
         } finally {
             StreamUtil.closeQuietly(fileReader);
         }
-        return OTHER;
+        return ProcessType.OTHER;
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

@@ -4,11 +4,6 @@
 
 package org.chromium.chrome.browser.crash;
 
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.BROWSER;
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.GPU;
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.OTHER;
-import static org.chromium.chrome.browser.crash.MinidumpUploadService.RENDERER;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.job.JobInfo;
@@ -585,8 +580,8 @@ public class MinidumpUploadServiceTest {
         final File minidumpFile =
                 new File(mTestRule.getCrashDir(), "chromium_renderer-123.dmp.try0");
         CrashTestRule.setUpMinidumpFile(minidumpFile, BOUNDARY, "browser");
-        Assert.assertEquals(
-                BROWSER, MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
+        Assert.assertEquals(MinidumpUploadService.ProcessType.BROWSER,
+                MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
     }
 
     @Test
@@ -596,8 +591,8 @@ public class MinidumpUploadServiceTest {
         final File minidumpFile =
                 new File(mTestRule.getCrashDir(), "chromium_renderer-123.dmp.try0");
         CrashTestRule.setUpMinidumpFile(minidumpFile, BOUNDARY, "renderer");
-        Assert.assertEquals(
-                RENDERER, MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
+        Assert.assertEquals(MinidumpUploadService.ProcessType.RENDERER,
+                MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
     }
 
     @Test
@@ -607,8 +602,8 @@ public class MinidumpUploadServiceTest {
         final File minidumpFile =
                 new File(mTestRule.getCrashDir(), "chromium_renderer-123.dmp.try0");
         CrashTestRule.setUpMinidumpFile(minidumpFile, BOUNDARY, "gpu-process");
-        Assert.assertEquals(
-                GPU, MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
+        Assert.assertEquals(MinidumpUploadService.ProcessType.GPU,
+                MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
     }
 
     @Test
@@ -618,8 +613,8 @@ public class MinidumpUploadServiceTest {
         final File minidumpFile =
                 new File(mTestRule.getCrashDir(), "chromium_renderer-123.dmp.try0");
         CrashTestRule.setUpMinidumpFile(minidumpFile, BOUNDARY, "weird test type");
-        Assert.assertEquals(
-                OTHER, MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
+        Assert.assertEquals(MinidumpUploadService.ProcessType.OTHER,
+                MinidumpUploadService.getCrashType(minidumpFile.getAbsolutePath()));
     }
 
     private class MinidumpPreparationContext extends AdvancedMockContext {