format fix up and make test win only

Author: AustinBenoit

analytics/integration_test/src/integration_test.cc

@@ -242,7 +242,7 @@ TEST_F(FirebaseAnalyticsTest, TestSetProperties) {
       InitiateOnDeviceConversionMeasurementWithHashedPhoneNumber(hashed_phone);
 }
 
-// #if defined(_WIN32)
+#if defined(_WIN32)
 TEST_F(FirebaseAnalyticsTest, TestSetLogCallback) {
   bool log_callback_called = false;
   firebase::analytics::SetLogCallback(
@@ -259,7 +259,7 @@ TEST_F(FirebaseAnalyticsTest, TestSetLogCallback) {
   EXPECT_TRUE(log_callback_called);
   firebase::analytics::SetLogCallback(nullptr);
 }
-// #endif  // defined(_WIN32)
+#endif  // defined(_WIN32)
 
 TEST_F(FirebaseAnalyticsTest, TestLogEvents) {
   // Log an event with no parameters.

app/src/util_android.h

@@ -191,7 +191,7 @@ bool LookupFieldIds(JNIEnv* env, jclass clazz,
 
 // Used to populate an array of MethodNameSignature.
 #define METHOD_NAME_SIGNATURE_5(id, name, signature, method_type, optional) \
-  {name, signature, method_type, optional}
+  { name, signature, method_type, optional }
 #define METHOD_NAME_SIGNATURE_4(id, name, signature, method_type) \
   METHOD_NAME_SIGNATURE_5(                                        \
       id, name, signature, method_type,                           \