Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java
index ea920c9b7f5486abb0415073b205c952132ee83d..3f5fce4b4d7c931c2f1e4e82b4cf1a3686da8556 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omaha/StringSanitizerTest.java
@@ -5,19 +5,25 @@
 package org.chromium.chrome.browser.omaha;
 
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 
 /** Tests the Omaha StringSanitizer. */
-public class StringSanitizerTest extends InstrumentationTestCase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class StringSanitizerTest {
+    @Test
     @SmallTest
     @Feature({"Omaha"})
     public void testSanitizeStrings() {
-        assertEquals("normal string", StringSanitizer.sanitize("Normal string"));
-        assertEquals("extra spaces string",
-                StringSanitizer.sanitize("\nExtra,  spaces;  string "));
-        assertEquals("a quick brown fox jumped over the lazy dog",
+        Assert.assertEquals("normal string", StringSanitizer.sanitize("Normal string"));
+        Assert.assertEquals(
+                "extra spaces string", StringSanitizer.sanitize("\nExtra,  spaces;  string "));
+        Assert.assertEquals("a quick brown fox jumped over the lazy dog",
                 StringSanitizer.sanitize("  a\"quick;  brown,fox'jumped;over \nthe\rlazy\tdog\n"));
     }
 }