Review fixes

Author: dlarocque

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Candidate.kt

@@ -300,15 +300,15 @@ public class FinishReason private constructor(public val name: String, public va
  * [Service Specific Terms](https://cloud.google.com/terms/service-terms) for "Grounding with Google
  * Search".
  *
- * @property webSearchQueries A list of web search queries that the model performed to gather the
+ * @property webSearchQueries The list of web search queries that the model performed to gather the
  * grounding information. These can be used to allow users to explore the search results themselves.
  * @property searchEntryPoint Google search entry point for web searches. This contains an HTML/CSS
  * snippet that **must** be embedded in an app to display a Google Search Entry point for follow-up
  * web searches related to the model's "Grounded Response". To ensure proper rendering, it's
  * recommended to display this content within a `WebView`.
- * @property groundingChunks A list of [GroundingChunk] objects. Each chunk represents a piece of
+ * @property groundingChunks The list of [GroundingChunk] objects. Each chunk represents a piece of
  * retrieved content (e.g. from a web page) that the model used to ground its response.
- * @property groundingSupports A list of [GroundingSupport] objects. Each object details how
+ * @property groundingSupports The list of [GroundingSupport] objects. Each object details how
  * specific segments of the model's response are supported by the `groundingChunks`.
  */
 public class GroundingMetadata(
@@ -343,7 +343,7 @@ public class GroundingMetadata(
 }
 
 /**
- * A class representing the Google Search entry point.
+ * Represents a Google Search entry point.
  *
  * When using this feature, you are required to comply with the
  * [Service Specific Terms](https://cloud.google.com/terms/service-terms) for "Grounding with Google

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/GoogleSearch.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,4 +26,8 @@ import kotlinx.serialization.Serializable
  * the Grounding with Google Search terms outlined in the
  * [Service Specific Terms](https://cloud.google.com/terms/service-terms).
  */
-@Serializable public class GoogleSearch {}
+public class GoogleSearch {
+  @Serializable internal class Internal()
+
+  internal fun toInternal() = Internal()
+}

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Tool.kt

@@ -33,12 +33,12 @@ internal constructor(
   internal fun toInternal() =
     Internal(
       functionDeclarations?.map { it.toInternal() } ?: emptyList(),
-      googleSearch = this.googleSearch
+      googleSearch = this.googleSearch?.toInternal()
     )
   @Serializable
   internal data class Internal(
     val functionDeclarations: List<FunctionDeclaration.Internal>? = null,
-    val googleSearch: GoogleSearch? = null,
+    val googleSearch: GoogleSearch.Internal? = null,
     // This is a json object because it is not possible to make a data class with no parameters.
     val codeExecution: JsonObject? = null,
   )

firebase-ai/src/test/java/com/google/firebase/ai/DevAPIUnarySnapshotTests.kt

@@ -99,7 +99,7 @@ internal class DevAPIUnarySnapshotTests {
       withTimeout(testTimeout) { shouldThrow<ServerException> { model.generateContent("prompt") } }
     }
 
-  // This test case can be removed once https://b.corp.google.com/issues/422779395 (internal) is
+  // This test case can be removed once b/422779395 is
   // fixed.
   @Test
   fun `google search grounding empty grounding chunks`() =

firebase-ai/src/test/java/com/google/firebase/ai/SerializationTests.kt

@@ -427,7 +427,7 @@ internal class SerializationTests {
       }
       """
         .trimIndent()
-    val actualJson = descriptorToJson(GoogleSearch.serializer().descriptor)
+    val actualJson = descriptorToJson(GoogleSearch.Internal.serializer().descriptor)
     expectedJsonAsString shouldEqualJson actualJson.toString()
   }
 }

firebase-ai/src/test/java/com/google/firebase/ai/common/APIControllerTests.kt

@@ -274,7 +274,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
@@ -290,7 +290,7 @@ internal class RequestFormatTests {
           GenerateContentRequest(
             model = "unused",
             contents = listOf(Content.Internal(parts = listOf(TextPart.Internal("Arbitrary")))),
-            tools = listOf(Tool.Internal(googleSearch = GoogleSearch())),
+            tools = listOf(Tool.Internal(googleSearch = GoogleSearch.Internal())),
           )
         )
         .collect { channel.close() }