Remove AndroidModuleModel.getAndroidProject()

(1) Replace several usages in android.core with suitable alternatives;

(2) Use `GradleAndroidModel` directly everywhere in Gradle specific
    code;

(3) Replace some mocking with @VisibleForTesting methods.

Bug: 147586218
Test: n/a
Change-Id: Iff7f595f630244b6f0a6e0518f1264fa61cdf646

3 files changed, 8 insertions, 8 deletions

diff --git a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt
index 6005ce8535f..366ab197c0e 100644
--- a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt
+++ b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt
@@ -21,7 +21,7 @@ import com.android.ide.common.repository.GradleCoordinate
 import com.android.ide.common.repository.GradleVersion
 import com.android.ide.common.repository.SdkMavenRepository
 import com.android.tools.idea.gradle.plugin.LatestKnownPluginVersionProvider
-import com.android.tools.idea.gradle.project.model.AndroidModuleModel
+import com.android.tools.idea.gradle.project.model.GradleAndroidModel
 import com.android.tools.idea.gradle.project.upgrade.GradlePluginUpgradeState.Importance.RECOMMEND
 import com.android.tools.idea.gradle.project.upgrade.computeGradlePluginUpgradeState
 import com.android.tools.idea.gradle.project.upgrade.findPluginInfo
@@ -80,7 +80,7 @@ class AndroidLintIdeSupport : LintIdeSupport() {
   }
 
   override fun getBaselineFile(client: LintIdeClient, module: Module): File? {
-    val model = AndroidModuleModel.get(module) ?: return null
+    val model = GradleAndroidModel.get(module) ?: return null
     val version = model.agpVersion ?: return null
     if (version.isAtLeast(2, 3, 1)) {
       val options = model.androidProject.lintOptions
@@ -103,7 +103,7 @@ class AndroidLintIdeSupport : LintIdeSupport() {
   }
 
   override fun getSeverityOverrides(module: Module): Map<String, Int>? {
-    val model = AndroidModuleModel.get(module) ?: return null
+    val model = GradleAndroidModel.get(module) ?: return null
     val version = model.agpVersion ?: return null
     if (version.isAtLeast(2, 3, 1)) {
       val options = model.androidProject.lintOptions
diff --git a/android-lint/src/com/android/tools/idea/lint/LintIdeAnalytics.kt b/android-lint/src/com/android/tools/idea/lint/LintIdeAnalytics.kt
index 1fd0b61c129..25b072023e0 100644
--- a/android-lint/src/com/android/tools/idea/lint/LintIdeAnalytics.kt
+++ b/android-lint/src/com/android/tools/idea/lint/LintIdeAnalytics.kt
@@ -20,7 +20,7 @@ import com.android.tools.analytics.Anonymizer
 import com.android.tools.analytics.CommonMetricsData
 import com.android.tools.analytics.UsageTracker
 import com.android.tools.idea.gradle.model.IdeAndroidProjectType
-import com.android.tools.idea.gradle.project.model.AndroidModuleModel
+import com.android.tools.idea.gradle.project.model.GradleAndroidModel
 import com.android.tools.idea.lint.common.LintProblemData
 import com.android.tools.idea.stats.withProjectId
 import com.android.tools.lint.client.api.LintDriver
@@ -165,7 +165,7 @@ class LintIdeAnalytics(private val project: com.intellij.openapi.project.Project
     }
 
     if (severityModule != null) {
-      val model = AndroidModuleModel.get(severityModule)
+      val model = GradleAndroidModel.get(severityModule)
       if (model != null) {
         try {
           val gradleModel = model.androidProject
@@ -215,7 +215,7 @@ class LintIdeAnalytics(private val project: com.intellij.openapi.project.Project
 
     val moduleManager = ModuleManager.getInstance(project)
     for (module in moduleManager.modules) {
-      val androidModel = AndroidModuleModel.get(module)
+      val androidModel = GradleAndroidModel.get(module)
       if (androidModel != null) {
         if (androidModel.androidProject.projectType == IdeAndroidProjectType.PROJECT_TYPE_APP) {
           return androidModel.applicationId
diff --git a/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java b/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java
index 3af81352edb..667f9616464 100644
--- a/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java
+++ b/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java
@@ -23,7 +23,7 @@ import static com.android.tools.lint.checks.ManifestDetector.MOCK_LOCATION_PERMI
 
 import com.android.tools.idea.gradle.model.IdeBuildType;
 import com.android.tools.idea.gradle.model.IdeBuildTypeContainer;
-import com.android.tools.idea.gradle.project.model.AndroidModuleModel;
+import com.android.tools.idea.gradle.project.model.GradleAndroidModel;
 import com.android.tools.idea.lint.common.AndroidQuickfixContexts;
 import com.android.tools.idea.lint.common.DefaultLintQuickFix;
 import com.android.utils.Pair;
@@ -75,7 +75,7 @@ public class MoveToDebugManifestQuickFix extends DefaultLintQuickFix {
           if (facet != null) {
             VirtualFile mainManifest = SourceProviderManager.getInstance(facet).getMainManifestFile();
             // TODO: b/22928250
-            AndroidModuleModel androidModel = AndroidModuleModel.get(facet);
+            GradleAndroidModel androidModel = GradleAndroidModel.get(facet);
             if (androidModel != null && mainManifest != null
                 && mainManifest.getParent() != null && mainManifest.getParent().getParent() != null) {
               final VirtualFile src = mainManifest.getParent().getParent();