Format code.

Author: jonsimantov

gma/src/include/firebase/gma/ump/consent_info.h

@@ -32,6 +32,9 @@ namespace gma {
 ///
 /// The User Messaging Platform (UMP) SDK is Google’s option to handle user
 /// privacy and consent in mobile apps.
+///
+/// @deprecated The firebase::gma::ump namespace has been deprecated and
+/// renamed to firebase::ump.
 namespace ump {
 
 namespace internal {

release_build_files/readme.md

@@ -658,7 +658,8 @@ code.
 -   Changes
     - UMP: Moved the User Messaging Platform SDK to its own top-level
       library and to the firebase::ump namespace. The version in the
-      GMA library (in firebase::gma::ump) will be deprecated soon.
+      GMA library (in firebase::gma::ump) has been deprecated and will
+      be removed soon.
 
 ### 12.7.0
 -   Changes

ump/integration_test/src/integration_test.cc

@@ -135,9 +135,7 @@ void FirebaseUmpTest::SetUp() {
   ASSERT_NE(consent_info_, nullptr);
 }
 
-void FirebaseUmpTest::TearDown() {
-  TerminateUmp();
-}
+void FirebaseUmpTest::TearDown() { TerminateUmp(); }
 
 // Tests for User Messaging Platform
 TEST_F(FirebaseUmpTest, TestUmpInitialization) {
@@ -750,9 +748,8 @@ TEST_F(FirebaseUmpTest, TestUmpMethodsReturnOperationInProgress) {
       consent_info_->RequestConsentInfoUpdate(params);
   firebase::Future<void> future_request_2 =
       consent_info_->RequestConsentInfoUpdate(params);
-  WaitForCompletion(
-      future_request_2, "RequestConsentInfoUpdate second",
-      firebase::ump::kConsentRequestErrorOperationInProgress);
+  WaitForCompletion(future_request_2, "RequestConsentInfoUpdate second",
+                    firebase::ump::kConsentRequestErrorOperationInProgress);
   WaitForCompletion(future_request_1, "RequestConsentInfoUpdate first",
                     {firebase::ump::kConsentRequestSuccess,
                      firebase::ump::kConsentRequestErrorNetwork});
@@ -785,9 +782,8 @@ TEST_F(FirebaseUmpTest, TestUmpMethodsReturnOperationInProgressWithUI) {
       consent_info_->RequestConsentInfoUpdate(params);
   firebase::Future<void> future_request_2 =
       consent_info_->RequestConsentInfoUpdate(params);
-  WaitForCompletion(
-      future_request_2, "RequestConsentInfoUpdate second",
-      firebase::ump::kConsentRequestErrorOperationInProgress);
+  WaitForCompletion(future_request_2, "RequestConsentInfoUpdate second",
+                    firebase::ump::kConsentRequestErrorOperationInProgress);
   WaitForCompletion(future_request_1, "RequestConsentInfoUpdate first");
 
   firebase::Future<void> future_load_1 = consent_info_->LoadConsentForm();

ump/src/android/consent_info_internal_android.cc

@@ -25,8 +25,8 @@
 #include "app/src/thread.h"
 #include "app/src/util_android.h"
 #include "firebase/internal/common.h"
-#include "ump/ump_resources.h"
 #include "ump/src/android/ump_android.h"
+#include "ump/ump_resources.h"
 
 namespace firebase {
 namespace ump {

ump/src/common/consent_info.cc

@@ -18,8 +18,8 @@
 
 #include "app/src/assert.h"
 #include "firebase/app.h"
-#include "firebase/ump.h"
 #include "firebase/internal/platform.h"
+#include "firebase/ump.h"
 #include "ump//src/common/consent_info_internal.h"
 
 namespace firebase {

ump/src/common/consent_info_internal.h

@@ -20,9 +20,9 @@
 #include "app/src/cleanup_notifier.h"
 #include "app/src/reference_counted_future_impl.h"
 #include "firebase/future.h"
+#include "firebase/internal/platform.h"
 #include "firebase/ump.h"
 #include "firebase/ump/types.h"
-#include "firebase/internal/platform.h"
 
 #if FIREBASE_PLATFORM_ANDROID
 #include <jni.h>

ump/src/include/firebase/ump/consent_info.h

@@ -19,8 +19,8 @@
 
 #include "firebase/app.h"
 #include "firebase/future.h"
-#include "firebase/ump/types.h"
 #include "firebase/internal/platform.h"
+#include "firebase/ump/types.h"
 
 #if FIREBASE_PLATFORM_ANDROID
 #include <jni.h>