Automated g4 rollback of changelist 267625598.

*** Reason for rollback ***

Dependent on Rolling back CL 267398802 which breaks linux build

*** Original change description ***

Add blocking methods Wait() and Await() to FutureBase and Future
(respectively).  Wait() just blocks until the future is completed,
or a timeout expires.  Await() blocks until the future is completed,
or a timeout expires, and then returns a pointer to the future's result,
or nullptr if the timeout expired.

***

PiperOrigin-RevId: 267672880

Author: markchandler

app/CMakeLists.txt

@@ -134,7 +134,6 @@ set(common_SRCS
     src/callback.cc
     src/cleanup_notifier.cc
     src/function_registry.cc
-    src/future.cc
     src/future_manager.cc
     src/path.cc
     src/reference_counted_future_impl.cc

app/src/future.cc

@@ -146,27 +146,6 @@ class FutureBase {
   /// pending. Cast is required since GetFutureResult() returns void*.
   const void* result_void() const;
 
-#if defined(INTERNAL_EXPERIMENTAL)
-  /// Special timeout value indicating an infinite timeout.
-  ///
-  /// Passing this value to FutureBase::Wait() or Future<T>::Await() will cause
-  /// those methods to wait until the future is complete.
-  ///
-  /// @Warning It is inadvisable to use this from code that could be called
-  /// from an event loop.
-  static const int kWaitTimeoutInfinite;
-
-  /// Block (i.e. suspend the current thread) until either the future is
-  /// completed or the specified timeout period (in milliseconds) has elapsed.
-  /// If `timeout_milliseconds` is `kWaitTimeoutInfinite`, then the timeout
-  /// period is treated as being infinite, i.e. this will block until the
-  /// future is completed.
-  ///
-  /// @return True if the future completed, or
-  ///         false if the timeout period elapsed before the future completed.
-  bool Wait(int timeout_milliseconds) const;
-#endif  // defined(INTERNAL_EXPERIMENTAL)
-
   /// Register a single callback that will be called at most once, when the
   /// future is completed.
   ///
@@ -389,22 +368,6 @@ class Future : public FutureBase {
     return static_cast<const ResultType*>(result_void());
   }
 
-#if defined(INTERNAL_EXPERIMENTAL)
-  /// Waits (blocks) until either the future is completed, or the specified
-  /// timeout period (in milliseconds) has elapsed, then returns the result of
-  /// the asynchronous call.
-  ///
-  /// This is a convenience method that calls Wait() and then returns result().
-  ///
-  /// If `timeout_milliseconds` is `kWaitTimeoutInfinite`, then the timeout
-  /// period is treated as being infinite, i.e. this will block until the
-  /// future is completed.
-  const ResultType* Await(int timeout_milliseconds) const {
-    Wait(timeout_milliseconds);
-    return result();
-  }
-#endif  // defined(INTERNAL_EXPERIMENTAL)
-
   /// Register a single callback that will be called at most once, when the
   /// future is completed.
   ///

app/src/include/firebase/future.h

@@ -146,5 +146,4 @@ void Thread::Detach() {
 
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace FIREBASE_NAMESPACE
-
-#endif  // defined(_STLPORT_VERSION)
+#endif