Merge WebappInfo and WebApkMetaData part 2/2

chrome/android/java_sources.gni

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 chrome_java_sources = [
   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
   "java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java",
   "java/src/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java",
   "java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.java",
   "java/src/org/chromium/chrome/browser/ApplicationInitialization.java",
@@ skipping 1013 matching lines @@
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity3.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity4.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity5.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity6.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity7.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity8.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity9.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkManagedActivity.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkMetaData.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkVersionManager.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity0.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity1.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity2.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity3.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity4.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity5.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity6.java",
@@ skipping 454 matching lines @@
   "junit/src/org/chromium/chrome/browser/omaha/VersionNumberTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",
   "junit/src/org/chromium/chrome/browser/payments/CurrencyStringFormatterUnitTest.java",
   "junit/src/org/chromium/chrome/browser/snackbar/SnackbarCollectionUnitTest.java",
   "junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/tabstate/TabStateUnitTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java",
-  "junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerTest.java",
 ]
 
 sync_shell_test_java_sources = [
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java",
   "sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java",
 ]
 
 # Only used for testing, should not be shipped to end users.
 if (!is_official_build) {
   chrome_java_sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ]
   chrome_test_java_sources += [ "javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageSavePageLaterEvaluationTest.java" ]
 }