chore: update windows types to match latest

Author: russellwheatley

packages/firebase_core/firebase_core/windows/firebase_core_plugin.cpp

@@ -51,9 +51,9 @@ FirebaseCorePlugin::FirebaseCorePlugin() {}
 
 FirebaseCorePlugin::~FirebaseCorePlugin() = default;
 
-// Convert a Pigeon FirebaseOptions to a Firebase Options.
-firebase::AppOptions PigeonFirebaseOptionsToAppOptions(
-    const PigeonFirebaseOptions &pigeon_options) {
+// Convert a CoreFirebaseOptions to a Firebase Options.
+firebase::AppOptions CoreFirebaseOptionsToAppOptions(
+    const CoreFirebaseOptions &pigeon_options) {
   firebase::AppOptions options;
   options.set_api_key(pigeon_options.api_key().c_str());
   options.set_app_id(pigeon_options.app_id().c_str());
@@ -73,21 +73,19 @@ firebase::AppOptions PigeonFirebaseOptionsToAppOptions(
   return options;
 }
 
-// Convert a AppOptions to PigeonInitializeOption
-PigeonFirebaseOptions optionsFromFIROptions(
+// Convert a AppOptions to CoreFirebaseOptions
+CoreFirebaseOptions optionsFromFIROptions(
     const firebase::AppOptions &options) {
-  PigeonFirebaseOptions pigeon_options = PigeonFirebaseOptions();
-  pigeon_options.set_api_key(options.api_key());
-  pigeon_options.set_app_id(options.app_id());
+  CoreFirebaseOptions pigeon_options = CoreFirebaseOptions(
+      options.api_key(), options.app_id(), options.messaging_sender_id(),
+      options.project_id());
   // AppOptions initialises as empty char so we check to stop empty string to
   // Flutter Same for storage bucket below
   const char *db_url = options.database_url();
   if (db_url != nullptr && db_url[0] != '\0') {
     pigeon_options.set_database_u_r_l(db_url);
   }
   pigeon_options.set_tracking_id(nullptr);
-  pigeon_options.set_messaging_sender_id(options.messaging_sender_id());
-  pigeon_options.set_project_id(options.project_id());
 
   const char *storage_bucket = options.storage_bucket();
   if (storage_bucket != nullptr && storage_bucket[0] != '\0') {
@@ -96,34 +94,34 @@ PigeonFirebaseOptions optionsFromFIROptions(
   return pigeon_options;
 }
 
-// Convert a firebase::App to PigeonInitializeResponse
-PigeonInitializeResponse AppToPigeonInitializeResponse(const App &app) {
-  PigeonInitializeResponse response = PigeonInitializeResponse();
-  response.set_name(app.name());
-  response.set_options(optionsFromFIROptions(app.options()));
+// Convert a firebase::App to CoreInitializeResponse
+CoreInitializeResponse AppToCoreInitializeResponse(const App &app) {
+  flutter::EncodableMap plugin_constants;
+  CoreInitializeResponse response = CoreInitializeResponse(
+      app.name(), optionsFromFIROptions(app.options()), plugin_constants);
   return response;
 }
 
 void FirebaseCorePlugin::InitializeApp(
     const std::string &app_name,
-    const PigeonFirebaseOptions &initialize_app_request,
-    std::function<void(ErrorOr<PigeonInitializeResponse> reply)> result) {
+    const CoreFirebaseOptions &initialize_app_request,
+    std::function<void(ErrorOr<CoreInitializeResponse> reply)> result) {
   // Create an app
   App *app =
-      App::Create(PigeonFirebaseOptionsToAppOptions(initialize_app_request),
+      App::Create(CoreFirebaseOptionsToAppOptions(initialize_app_request),
                   app_name.c_str());
 
   // Send back the result to Flutter
-  result(AppToPigeonInitializeResponse(*app));
+  result(AppToCoreInitializeResponse(*app));
 }
 
 void FirebaseCorePlugin::InitializeCore(
     std::function<void(ErrorOr<flutter::EncodableList> reply)> result) {
   // TODO: Missing function to get the list of currently initialized apps
-  std::vector<PigeonInitializeResponse> initializedApps;
+  std::vector<CoreInitializeResponse> initializedApps;
   std::vector<App *> all_apps = App::GetApps();
   for (const App *app : all_apps) {
-    initializedApps.push_back(AppToPigeonInitializeResponse(*app));
+    initializedApps.push_back(AppToCoreInitializeResponse(*app));
   }
 
   flutter::EncodableList encodableList;
@@ -135,7 +133,7 @@ void FirebaseCorePlugin::InitializeCore(
 }
 
 void FirebaseCorePlugin::OptionsFromResource(
-    std::function<void(ErrorOr<PigeonFirebaseOptions> reply)> result) {}
+    std::function<void(ErrorOr<CoreFirebaseOptions> reply)> result) {}
 
 void FirebaseCorePlugin::SetAutomaticDataCollectionEnabled(
     const std::string &app_name, bool enabled,

packages/firebase_core/firebase_core/windows/firebase_core_plugin.h

@@ -34,14 +34,14 @@ class FirebaseCorePlugin : public flutter::Plugin,
   // FirebaseCoreHostApi
   virtual void InitializeApp(
       const std::string &app_name,
-      const PigeonFirebaseOptions &initialize_app_request,
-      std::function<void(ErrorOr<PigeonInitializeResponse> reply)> result)
+      const CoreFirebaseOptions &initialize_app_request,
+      std::function<void(ErrorOr<CoreInitializeResponse> reply)> result)
       override;
   virtual void InitializeCore(
       std::function<void(ErrorOr<flutter::EncodableList> reply)> result)
       override;
   virtual void OptionsFromResource(
-      std::function<void(ErrorOr<PigeonFirebaseOptions> reply)> result)
+      std::function<void(ErrorOr<CoreFirebaseOptions> reply)> result)
       override;
 
   // FirebaseAppHostApi