Fix tests

Author: var-const

Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_IntegrationTests_iOS.xcscheme

@@ -26,8 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      enableAddressSanitizer = "YES"
       enableASanStackUseAfterReturn = "YES"
-      enableThreadSanitizer = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference

Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm

@@ -345,7 +345,7 @@ - (void)writeUserMutation:(FSTMutation *)mutation {
   write.write = mutation;
   [[self currentOutstandingWrites] addObject:write];
   LOG_DEBUG("sending a user write.");
-  _workerQueue->EnqueueBlocking([&] {
+  _workerQueue->EnqueueBlocking([=] {
     [self.syncEngine writeMutations:@[ mutation ]
                          completion:^(NSError *_Nullable error) {
                            LOG_DEBUG("A callback was called with error: %s", error);

Firestore/Source/Core/FSTFirestoreClient.mm

@@ -132,7 +132,7 @@ - (instancetype)initWithDatabaseInfo:(const DatabaseInfo &)databaseInfo
     bool initialized = false;
 
     __weak __typeof__(self) weakSelf = self;
-    auto credentialChangeListener = [initialized, userPromise, weakSelf,
+    auto credentialChangeListener = [self, initialized, userPromise, weakSelf,
                                      workerQueue](User user) mutable {
       __typeof__(self) strongSelf = weakSelf;
       if (!strongSelf) return;

Firestore/core/src/firebase/firestore/util/async_queue.cc

@@ -25,8 +25,6 @@ namespace firebase {
 namespace firestore {
 namespace util {
 
-using Executor;
-
 AsyncQueue::AsyncQueue(std::unique_ptr<Executor> executor)
     : executor_{std::move(executor)} {
   is_operation_in_progress_ = false;

Firestore/core/src/firebase/firestore/util/executor_libdispatch.h

@@ -39,6 +39,8 @@ namespace firebase {
 namespace firestore {
 namespace util {
 
+namespace internal {
+
 // Generic wrapper over `dispatch_async_f`, providing `dispatch_async`-like
 // interface: accepts an arbitrary invocable object in place of an Objective-C
 // block.
@@ -47,6 +49,8 @@ void DispatchAsync(dispatch_queue_t queue, std::function<void()>&& work);
 // Similar to `DispatchAsync` but wraps `dispatch_sync_f`.
 void DispatchSync(dispatch_queue_t queue, std::function<void()> work);
 
+}  // namespace internal
+
 class TimeSlot;
 
 // A serial queue built on top of libdispatch. The operations are run on

Firestore/core/src/firebase/firestore/util/executor_libdispatch.mm

@@ -45,6 +45,8 @@
 
 }  // namespace
 
+namespace internal {
+
 void DispatchAsync(const dispatch_queue_t queue, std::function<void()>&& work) {
   // Dynamically allocate the function to make sure the object is valid by the
   // time libdispatch gets to it.
@@ -70,6 +72,11 @@ void DispatchSync(const dispatch_queue_t queue, std::function<void()> work) {
   });
 }
 
+}  // namespace internal
+
+using internal::DispatchAsync;
+using internal::DispatchSync;
+
 namespace {
 
 template <typename Work>

Firestore/core/test/firebase/firestore/util/executor_test.cc

@@ -30,7 +30,6 @@ namespace firestore {
 namespace util {
 
 namespace chr = std::chrono;
-using Executor;
 
 namespace {
 

Firestore/core/test/firebase/firestore/util/grpc_stream_tester.cc

@@ -29,7 +29,6 @@ namespace firebase {
 namespace firestore {
 namespace util {
 
-using ExecutorStd;
 using auth::Token;
 using auth::User;
 using model::DatabaseId;