Deduplicate WebApkUpdateManager and GeolocationHeader test file names.

This CL also runs git cl format on the test files.

BUG=778442

Change-Id: If823c7f0dc2c26485102c74223d1c1c6a946f0bb
Reviewed-on: https://chromium-review.googlesource.com/743162
Commit-Queue: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512699}

chrome/android/java_sources.gni

@@ -1900,7 +1900,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/omnibox/KeyboardHideHelperUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/LocationBarLayoutTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModelUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java",
+  "junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTrackerTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java",
@@ -1926,7 +1926,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java",
-  "junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerTest.java",
+  "junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java",
   "junit/src/org/chromium/chrome/browser/widget/selection/SelectionDelegateTest.java",
 ]
 

chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java → chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderUnitTest.java

@@ -25,9 +25,9 @@ import org.robolectric.annotation.Implements;
 
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.omnibox.geo.GeolocationHeaderTest.ShadowRecordHistogram;
-import org.chromium.chrome.browser.omnibox.geo.GeolocationHeaderTest.ShadowUrlUtilities;
-import org.chromium.chrome.browser.omnibox.geo.GeolocationHeaderTest.ShadowWebsitePreferenceBridge;
+import org.chromium.chrome.browser.omnibox.geo.GeolocationHeaderUnitTest.ShadowRecordHistogram;
+import org.chromium.chrome.browser.omnibox.geo.GeolocationHeaderUnitTest.ShadowUrlUtilities;
+import org.chromium.chrome.browser.omnibox.geo.GeolocationHeaderUnitTest.ShadowWebsitePreferenceBridge;
 import org.chromium.chrome.browser.omnibox.geo.VisibleNetworks.VisibleCell;
 import org.chromium.chrome.browser.omnibox.geo.VisibleNetworks.VisibleWifi;
 import org.chromium.chrome.browser.preferences.website.WebsitePreferenceBridge;
@@ -46,7 +46,7 @@ import java.util.HashSet;
 @Config(manifest = Config.NONE,
         shadows = {ShadowUrlUtilities.class, ShadowRecordHistogram.class,
                 ShadowWebsitePreferenceBridge.class})
-public class GeolocationHeaderTest {
+public class GeolocationHeaderUnitTest {
     private static final String SEARCH_URL = "https://www.google.com/search?q=potatoes";
 
     private static final double LOCATION_LAT = 20.3;
@@ -136,9 +136,9 @@ public class GeolocationHeaderTest {
 
     @Test
     public void testTrimVisibleNetworksEmptyOrNull() throws ProcessInitException {
-        VisibleNetworks visibleNetworks = VisibleNetworks.create(
-                VisibleWifi.create("whatever", null, null, null),
-                null, new HashSet(), new HashSet());
+        VisibleNetworks visibleNetworks =
+                VisibleNetworks.create(VisibleWifi.create("whatever", null, null, null), null,
+                        new HashSet(), new HashSet());
         assertNull(GeolocationHeader.trimVisibleNetworks(visibleNetworks));
         assertNull(GeolocationHeader.trimVisibleNetworks(null));
     }

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerTest.java → chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java

@@ -53,7 +53,7 @@ import java.util.Map;
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE, shadows = {CustomShadowAsyncTask.class})
-public class WebApkUpdateManagerTest {
+public class WebApkUpdateManagerUnitTest {
     @Rule
     public DisableHistogramsRule mDisableHistogramsRule = new DisableHistogramsRule();
 
@@ -222,8 +222,7 @@ public class WebApkUpdateManagerTest {
     private void registerWebApk(
             String packageName, ManifestData manifestData, int shellApkVersionCode) {
         Bundle metaData = new Bundle();
-        metaData.putInt(
-                WebApkMetaDataKeys.SHELL_APK_VERSION, shellApkVersionCode);
+        metaData.putInt(WebApkMetaDataKeys.SHELL_APK_VERSION, shellApkVersionCode);
         metaData.putString(WebApkMetaDataKeys.START_URL, manifestData.startUrl);
         metaData.putString(WebApkMetaDataKeys.SCOPE, manifestData.scopeUrl);
         metaData.putString(WebApkMetaDataKeys.NAME, manifestData.name);
@@ -241,8 +240,8 @@ public class WebApkUpdateManagerTest {
             iconUrlsAndIconMurmur2Hashes += " " + mapEntry.getKey() + " " + murmur2Hash;
         }
         iconUrlsAndIconMurmur2Hashes = iconUrlsAndIconMurmur2Hashes.trim();
-        metaData.putString(WebApkMetaDataKeys.ICON_URLS_AND_ICON_MURMUR2_HASHES,
-                iconUrlsAndIconMurmur2Hashes);
+        metaData.putString(
+                WebApkMetaDataKeys.ICON_URLS_AND_ICON_MURMUR2_HASHES, iconUrlsAndIconMurmur2Hashes);
 
         WebApkTestHelper.registerWebApkWithMetaData(packageName, metaData);
     }
@@ -287,7 +286,7 @@ public class WebApkUpdateManagerTest {
      * @param color The bitmap color.
      */
     private static Bitmap createBitmap(int color) {
-        int colors[] = { color };
+        int colors[] = {color};
         return ShadowBitmap.createBitmap(colors, 1, 1, Bitmap.Config.ALPHA_8);
     }
 
@@ -316,8 +315,8 @@ public class WebApkUpdateManagerTest {
         onGotManifestData(updateManager, manifestData);
     }
 
-    private static void onGotManifestData(WebApkUpdateManager updateManager,
-            ManifestData fetchedManifestData) {
+    private static void onGotManifestData(
+            WebApkUpdateManager updateManager, ManifestData fetchedManifestData) {
         String primaryIconUrl = randomIconUrl(fetchedManifestData);
         String badgeIconUrl = randomIconUrl(fetchedManifestData);
         updateManager.onGotManifestData(
@@ -718,8 +717,7 @@ public class WebApkUpdateManagerTest {
         ManifestData oldData = defaultManifestData();
         oldData.startUrl = "/fancy/scope/special/snowflake.html";
         oldData.scopeUrl = "/fancy/scope/";
-        assertTrue(
-                !oldData.scopeUrl.equals(ShortcutHelper.getScopeFromUrl(oldData.startUrl)));
+        assertTrue(!oldData.scopeUrl.equals(ShortcutHelper.getScopeFromUrl(oldData.startUrl)));
         ManifestData fetchedData = defaultManifestData();
         fetchedData.startUrl = "/fancy/scope/special/snowflake.html";
         fetchedData.scopeUrl = "";