[M58 Branch (merge)] Fix the test build.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
index 4a4f2197acbcd0f5933fb97a91b95033c7b249f8..8996d835f988019957d3f9ba0078d2a3ed8838b0 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
@@ -35,9 +35,9 @@ import org.chromium.net.NetworkChangeNotifier;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 /**
  * Testcase for {@link MinidumpUploadService}.
@@ -81,7 +81,7 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
 
     @Override
     protected void tearDown() throws Exception {
-        ChromeFeatureList.setTestFeatures(null);
+        ChromeFeatureList.setTestEnabledFeatures(null);
         super.tearDown();
     }
 
@@ -91,9 +91,11 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
      * @param enable Whether to enable the JobScheduler API.
      */
     private void setJobSchedulerEnabled(boolean enable) {
-        Map<String, Boolean> features = new HashMap<>();
-        features.put(ChromeFeatureList.UPLOAD_CRASH_REPORTS_USING_JOB_SCHEDULER, enable);
-        ChromeFeatureList.setTestFeatures(features);
+        Set<String> features = new HashSet<>();
+        if (enable) {
+            features.add(ChromeFeatureList.UPLOAD_CRASH_REPORTS_USING_JOB_SCHEDULER);
+        }
+        ChromeFeatureList.setTestEnabledFeatures(features);
     }
 
     @SmallTest
@@ -619,7 +621,7 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
             assertEquals(TaskIds.CHROME_MINIDUMP_UPLOADING_JOB_ID, job.getId());
             assertEquals(ChromeMinidumpUploadJobService.class.getName(),
                     job.getService().getClassName());
-            return 0;
+            return JobScheduler.RESULT_SUCCESS;
         }
     };