Fix up the formatting and the enum in tc

Author: AustinBenoit

analytics/integration_test/src/integration_test.cc

@@ -242,11 +242,11 @@ 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(
-      [&](firebase::analytics::LogLevel log_level, const char* message) {
+      [&](firebase::LogLevel log_level, const char* message) {
         log_callback_called = true;
       });
   // Log an event with an invalid parameter to trigger a log message.
@@ -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.

analytics/src/analytics_desktop.cc

@@ -399,20 +399,20 @@ LogLevel ConvertAnalyticsLogLevelToFirebaseLogLevel(
   switch (log_level) {
     case kDebug:
       return kLogLevelDebug;
-      case kInfo:
-        return kLogLevelInfo;
-      case kWarning:
-        return kLogLevelWarning;
-      case kError:
-        return kLogLevelError;
-      default:
-        return kLogLevelInfo;
+    case kInfo:
+      return kLogLevelInfo;
+    case kWarning:
+      return kLogLevelWarning;
+    case kError:
+      return kLogLevelError;
+    default:
+      return kLogLevelInfo;
   }
 }
 
 // C-style callback that will be passed to the Google Analytics C API.
 static void GoogleAnalyticsWraperLogCallback(GoogleAnalytics_LogLevel log_level,
-                            const char* message) {
+                                             const char* message) {
   if (g_log_callback) {
     LogLevel firebase_log_level =
         ConvertAnalyticsLogLevelToFirebaseLogLevel(log_level);

analytics/src/include/firebase/analytics.h

@@ -25,9 +25,9 @@
 #include <vector>
 
 #include "firebase/app.h"
-#include "firebase/log.h"
 #include "firebase/future.h"
 #include "firebase/internal/common.h"
+#include "firebase/log.h"
 #include "firebase/variant.h"
 
 #if !defined(DOXYGEN) && !defined(SWIG)
@@ -615,7 +615,7 @@ void ResetAnalyticsData();
 ///
 /// @param[in] log_level The log level of the message.
 /// @param[in] message The message logged by the SDK.
-using LogCallback =  std::function<void(LogLevel, const char*)>;
+using LogCallback = std::function<void(LogLevel, const char*)>;
 
 /// @brief Allows the passing of a callback to be used when the SDK logs any
 /// messages regarding its behaviour. The callback must be thread-safe.

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,                           \