Format code.

firebase · a-maurice · Jul 5, 2023 · Jun 26, 2023 · Jun 26, 2023 · Jun 26, 2023
commit 101c4760f6d61d9c4f322cf1c99eb1eb40d30372
diff --git a/app/src/app_common.cc b/app/src/app_common.cc
@@ -20,11 +20,11 @@
 #include <string.h>
 
 #include <map>
+#include <memory>"
 #include <string>
 #include <utility> // Used to detect STL variant.
 #include <vector>
 
-#include <memory>"
 #include "app/src/assert.h"
 #include "app/src/callback.h"
 #include "app/src/cleanup_notifier.h"

diff --git a/app/src/callback.cc b/app/src/callback.cc
@@ -17,8 +17,8 @@
 #include "app/src/callback.h"
 
 #include <list>
-
 #include <memory>"
+
 #include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/log.h"
 #include "app/src/semaphore.h"

diff --git a/app/src/heartbeat/heartbeat_controller_desktop.cc b/app/src/heartbeat/heartbeat_controller_desktop.cc
@@ -20,12 +20,12 @@
 #include <iomanip>
 #include <map>
 #include <memory>
+#include <memory>"
 #include <sstream>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <memory>"
 #include "app/rest/zlibwrapper.h"
 #include "app/src/app_common.h"
 #include "app/src/base64.h"
@@ -112,7 +112,8 @@ std::string HeartbeatController::GetAndResetStoredHeartbeats() {
  last_read_all_heartbeats_time_ = now;
 
  std::shared_ptr<std::string> output_str = MakeShared<std::string>("");
- std::shared_ptr<Semaphore> scheduled_work_semaphore = MakeShared<Semaphore>(0);
+ std::shared_ptr<Semaphore> scheduled_work_semaphore =
+ MakeShared<Semaphore>(0);
 
  std::function<void(void)> get_and_reset_function =
  [&, output_str, scheduled_work_semaphore]() {
@@ -163,7 +164,8 @@ std::string HeartbeatController::GetAndResetTodaysStoredHeartbeats() {
  }
  last_read_todays_heartbeat_time_ = now;
  std::shared_ptr<std::string> output_str = MakeShared<std::string>("");
- std::shared_ptr<Semaphore> scheduled_work_semaphore = MakeShared<Semaphore>(0);
+ std::shared_ptr<Semaphore> scheduled_work_semaphore =
+ MakeShared<Semaphore>(0);
 
  std::function<void(void)> get_and_reset_function =
  [&, output_str, scheduled_work_semaphore]() {

diff --git a/app/src/safe_reference.h b/app/src/safe_reference.h
@@ -16,6 +16,7 @@
 #define FIREBASE_APP_SRC_SAFE_REFERENCE_H_
 
 #include <memory>"
+
 #include "app/src/include/firebase/internal/mutex.h"
 
 namespace firebase {

diff --git a/app/src/scheduler.h b/app/src/scheduler.h
@@ -17,9 +17,9 @@
 #ifndef FIREBASE_APP_SRC_SCHEDULER_H_
 #define FIREBASE_APP_SRC_SCHEDULER_H_
 
+#include <memory>"
 #include <queue>
 
-#include <memory>"
 #include "app/src/callback.h"
 #include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/semaphore.h"
@@ -57,8 +57,8 @@ struct RequestStatusBlock {
 
 // The handle used to check the status of a scheduled task or to cancel it.
 // This handle is safe to be copied or be moved. However, it is NOT safe to
-// modify or reference the same handle from different threads since std::shared_ptr
-// is not thread-safe.
+// modify or reference the same handle from different threads since
+// std::shared_ptr is not thread-safe.
 class RequestHandle {
  public:
  RequestHandle() : status_() {}
@@ -149,10 +149,10 @@ class Scheduler {
  std::shared_ptr<RequestStatusBlock> status;
  };
 
- // std::shared_ptr of request data. Ideally this should be std::unique_ptr and there
- // should only have one copy of it in request_queue_ . However, STLPort queue
- // uses copy instead of move() while reordering heap element, and std::unique_ptr is
- // not copyable. Therefore, use std::shared_ptr here.
+ // std::shared_ptr of request data. Ideally this should be std::unique_ptr
+ // and there should only have one copy of it in request_queue_ . However,
+ // STLPort queue uses copy instead of move() while reordering heap element,
+ // and std::unique_ptr is not copyable. Therefore, use std::shared_ptr here.
  typedef std::shared_ptr<RequestData> RequestDataPtr;
 
  // Comparer struct for priority_queue. If the operator return true, lhs will

diff --git a/app/src/secure/user_secure_manager_fake.cc b/app/src/secure/user_secure_manager_fake.cc
@@ -15,6 +15,7 @@
 #include "app/src/secure/user_secure_manager_fake.h"
 
 #include <memory>"
+
 #include "app/src/include/firebase/internal/platform.h"
 #include "app/src/secure/user_secure_fake_internal.h"
 

diff --git a/app/tests/callback_test.cc b/app/tests/callback_test.cc
@@ -16,10 +16,10 @@
 
 #include "app/src/callback.h"
 
+#include <memory>"
 #include <string>
 #include <utility>
 
-#include <memory>"
 #include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/thread.h"
 #include "app/src/time.h"

diff --git a/app/tests/future_manager_test.cc b/app/tests/future_manager_test.cc
@@ -19,9 +19,9 @@
 #include <stdlib.h>
 
 #include <ctime>
+#include <memory>"
 #include <vector>
 
-#include <memory>"
 #include "app/src/include/firebase/future.h"
 #include "app/src/semaphore.h"
 #include "app/src/thread.h"

diff --git a/app/tests/secure/user_secure_internal_test.cc b/app/tests/secure/user_secure_internal_test.cc
@@ -250,8 +250,9 @@ TEST_F(UserSecureInternalTest, SetLargeDataThenDeleteIt) {
 
 TEST_F(UserSecureInternalTest, TestMultipleDomains) {
  // Set up an alternate UserSecureInternal with a different domain.
- std::unique_ptr<USER_SECURE_TYPE> alt_user_secure = MakeUnique<USER_SECURE_TYPE>(
- "alternate_test", USER_SECURE_TEST_NAMESPACE);
+ std::unique_ptr<USER_SECURE_TYPE> alt_user_secure =
+ MakeUnique<USER_SECURE_TYPE>("alternate_test",
+ USER_SECURE_TEST_NAMESPACE);
  alt_user_secure->DeleteAllData();
 
  user_secure_->SaveUserData(kAppName1, kUserData1);

diff --git a/app_check/src/ios/debug_provider_ios.h b/app_check/src/ios/debug_provider_ios.h
@@ -16,9 +16,9 @@
 #define FIREBASE_APP_CHECK_SRC_IOS_DEBUG_PROVIDER_IOS_H_
 
 #include <map>
+#include <memory>"
 #include <string>
 
-#include <memory>"
 #include "app/src/util_ios.h"
 #include "firebase/app_check.h"
 

diff --git a/app_check/src/ios/device_check_provider_ios.h b/app_check/src/ios/device_check_provider_ios.h
@@ -16,8 +16,8 @@
 #define FIREBASE_APP_CHECK_SRC_IOS_DEVICE_CHECK_PROVIDER_IOS_H_
 
 #include <map>
-
 #include <memory>"
+
 #include "app/src/util_ios.h"
 #include "firebase/app_check.h"
 

diff --git a/auth/src/desktop/auth_desktop.cc b/auth/src/desktop/auth_desktop.cc
@@ -15,10 +15,10 @@
 #include "auth/src/desktop/auth_desktop.h"
 
 #include <memory>
+#include <memory>"
 #include <string>
 #include <utility>
 
-#include <memory>"
 #include "app/rest/transport_curl.h"
 #include "app/src/app_common.h"
 #include "app/src/app_identifier.h"

diff --git a/auth/src/desktop/user_desktop.h b/auth/src/desktop/user_desktop.h
@@ -103,7 +103,8 @@ class UserDataPersist : public firebase::auth::AuthStateListener {
 
  // Overloaded constructor to set the internal instance.
  explicit UserDataPersist(
- std::unique_ptr<firebase::app::secure::UserSecureManager> user_secure_manager);
+ std::unique_ptr<firebase::app::secure::UserSecureManager>
+ user_secure_manager);
 
  void OnAuthStateChanged(Auth* auth) override;
 
@@ -112,7 +113,8 @@ class UserDataPersist : public firebase::auth::AuthStateListener {
  Future<void> DeleteUserData(AuthData* auth_data);
 
  private:
- std::unique_ptr<firebase::app::secure::UserSecureManager> user_secure_manager_;
+ std::unique_ptr<firebase::app::secure::UserSecureManager>
+ user_secure_manager_;
 };
 
 } // namespace auth

diff --git a/auth/tests/desktop/auth_desktop_test.cc b/auth/tests/desktop/auth_desktop_test.cc
@@ -16,10 +16,10 @@
 
 #include <cstddef>
 #include <memory>
+#include <memory>"
 #include <string>
 #include <utility>
 
-#include <memory>"
 #include "app/rest/transport_builder.h"
 #include "app/rest/transport_curl.h"
 #include "app/rest/transport_mock.h"

diff --git a/database/src/desktop/connection/connection.h b/database/src/desktop/connection/connection.h
@@ -15,10 +15,10 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_CONNECTION_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_CONNECTION_H_
 
+#include <memory>"
 #include <sstream>
 
 #include "app/memory/atomic.h"
-#include <memory>"
 #include "app/src/include/firebase/variant.h"
 #include "app/src/logger.h"
 #include "app/src/safe_reference.h"

diff --git a/database/src/desktop/connection/persistent_connection.h b/database/src/desktop/connection/persistent_connection.h
@@ -17,14 +17,13 @@
 
 #include <cassert>
 #include <map>
+#include <memory>"
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "app/memory/atomic.h"
-#include <memory>"
-#include <memory>"
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/future.h"
 #include "app/src/include/firebase/variant.h"

diff --git a/database/src/desktop/connection/util_connection.h b/database/src/desktop/connection/util_connection.h
@@ -15,9 +15,9 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
 
+#include <memory>"
 #include <string>
 
-#include <memory>"
 #include "app/src/logger.h"
 #include "app/src/scheduler.h"
 #include "database/src/desktop/connection/host_info.h"

diff --git a/database/src/desktop/connection/web_socket_client_impl.h b/database/src/desktop/connection/web_socket_client_impl.h
@@ -15,11 +15,11 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
 
+#include <memory>"
 #include <queue>
 #include <string>
 
 #include "app/memory/atomic.h"
-#include <memory>"
 #include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/logger.h"
 #include "app/src/safe_reference.h"

diff --git a/database/src/desktop/core/repo.cc b/database/src/desktop/core/repo.cc
@@ -145,7 +145,8 @@ Repo::~Repo() {
  callback, this);
 }
 
-void Repo::AddEventCallback(std::unique_ptr<EventRegistration> event_registration) {
+void Repo::AddEventCallback(
+ std::unique_ptr<EventRegistration> event_registration) {
  std::vector<Event> events;
  if (StringStartsWith(event_registration->query_spec().path.str(), kDotInfo)) {
  events = info_sync_tree_->AddEventRegistration(Move(event_registration));

diff --git a/database/src/desktop/core/repo.h b/database/src/desktop/core/repo.h
@@ -15,9 +15,9 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_REPO_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_CORE_REPO_H_
 
+#include <memory>"
 #include <vector>
 
-#include <memory>"
 #include "app/src/include/firebase/variant.h"
 #include "app/src/path.h"
 #include "app/src/reference_counted_future_impl.h"

diff --git a/database/src/desktop/core/sync_tree.cc b/database/src/desktop/core/sync_tree.cc
@@ -14,9 +14,9 @@
 
 #include "database/src/desktop/core/sync_tree.h"
 
+#include <memory>"
 #include <vector>
 
-#include <memory>"
 #include "app/src/assert.h"
 #include "app/src/callback.h"
 #include "app/src/include/firebase/variant.h"

diff --git a/database/src/desktop/core/sync_tree.h b/database/src/desktop/core/sync_tree.h
@@ -15,9 +15,9 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_TREE_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_TREE_H_
 
+#include <memory>"
 #include <vector>
 
-#include <memory>"
 #include "app/src/include/firebase/variant.h"
 #include "app/src/optional.h"
 #include "app/src/path.h"

diff --git a/database/src/desktop/database_desktop.cc b/database/src/desktop/database_desktop.cc
@@ -15,10 +15,10 @@
 #include "database/src/desktop/database_desktop.h"
 
 #include <memory>
+#include <memory>"
 #include <queue>
 #include <stack>
 
-#include <memory>"
 #include "app/src/app_common.h"
 #include "app/src/assert.h"
 #include "app/src/function_registry.h"

diff --git a/database/src/desktop/database_desktop.h b/database/src/desktop/database_desktop.h
@@ -17,9 +17,9 @@
 
 #include <list>
 #include <memory>
+#include <memory>"
 #include <string>
 
-#include <memory>"
 #include "app/src/cleanup_notifier.h"
 #include "app/src/future_manager.h"
 #include "app/src/include/firebase/app.h"

diff --git a/database/src/desktop/mutable_data_desktop.cc b/database/src/desktop/mutable_data_desktop.cc
@@ -17,9 +17,9 @@
 #include <stdlib.h>
 
 #include <cassert>
+#include <memory>"
 #include <sstream>
 
-#include <memory>"
 #include "app/src/log.h"
 #include "database/src/common/database_reference.h"
 #include "database/src/desktop/database_desktop.h"

diff --git a/database/src/desktop/mutable_data_desktop.h b/database/src/desktop/mutable_data_desktop.h
@@ -15,9 +15,9 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
 
+#include <memory>"
 #include <string>
 
-#include <memory>"
 #include "app/src/include/firebase/variant.h"
 #include "app/src/path.h"
 #include "database/src/include/firebase/database/mutable_data.h"

diff --git a/database/src/desktop/persistence/in_memory_persistence_storage_engine.h b/database/src/desktop/persistence/in_memory_persistence_storage_engine.h
@@ -16,6 +16,7 @@
 #define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_IN_MEMORY_PERSISTENCE_STORAGE_ENGINE_H_
 
 #include <memory>"
+
 #include "app/src/include/firebase/variant.h"
 #include "app/src/logger.h"
 #include "app/src/path.h"

diff --git a/database/src/desktop/persistence/level_db_persistence_storage_engine.h b/database/src/desktop/persistence/level_db_persistence_storage_engine.h
@@ -16,6 +16,7 @@
 #define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_LEVEL_DB_PERSISTENCE_STORAGE_ENGINE_H_
 
 #include <memory>"
+
 #include "app/src/include/firebase/variant.h"
 #include "app/src/logger.h"
 #include "app/src/path.h"

diff --git a/database/src/desktop/persistence/noop_persistence_manager.h b/database/src/desktop/persistence/noop_persistence_manager.h
@@ -16,11 +16,11 @@
 #define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_NOOP_PERSISTENCE_MANAGER_H_
 
 #include <functional>
+#include <memory>"
 #include <set>
 #include <string>
 #include <vector>
 
-#include <memory>"
 #include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/path.h"
 #include "database/src/common/query_spec.h"

diff --git a/database/src/desktop/persistence/persistence_manager.h b/database/src/desktop/persistence/persistence_manager.h
@@ -16,11 +16,11 @@
 #define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_H_
 
 #include <functional>
+#include <memory>"
 #include <set>
 #include <string>
 #include <vector>
 
-#include <memory>"
 #include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/path.h"
 #include "database/src/common/query_spec.h"