revert test settings

Author: cherylEnkidu

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

@@ -89,6 +89,18 @@
             ReferencedContainer = "container:Firestore.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "PROJECT_ID"
+            value = "firestore-sdk-nightly"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "TARGET_BACKEND"
+            value = "nightly"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm

@@ -85,7 +85,7 @@
 static const double kPrimingTimeout = 45.0;
 
 static NSString *defaultProjectId;
-static NSString *defaultDatabaseId = @"enterprise";
+static NSString *defaultDatabaseId = @"(default)";
 static FIRFirestoreSettings *defaultSettings;
 
 static bool runningAgainstEmulator = false;

Firestore/core/src/api/ordering.h

@@ -17,6 +17,8 @@
 #ifndef FIRESTORE_CORE_SRC_API_ORDERING_H_
 #define FIRESTORE_CORE_SRC_API_ORDERING_H_
 
+#include <memory>
+#include <string>
 #include <utility>
 
 #include "Firestore/core/src/api/expressions.h"
@@ -26,8 +28,6 @@ namespace firebase {
 namespace firestore {
 namespace api {
 
-class UserDataReader;  // forward declaration
-
 class Ordering {
  public:
   enum Direction {

Firestore/core/src/api/stages.cc

@@ -332,8 +332,8 @@ ReplaceWith::ReplaceWith(std::string field_name)
     : expr_(nullptr), field_name_(std::move(field_name)) {
 }
 
-Sample::Sample(std::string type, int64_t count, double percentage_)
-    : type_(type), count_(count), percentage_(percentage_) {
+Sample::Sample(std::string type, int64_t count, double percentage)
+    : type_(type), count_(count), percentage_(percentage) {
 }
 
 google_firestore_v1_Pipeline_Stage Sample::to_proto() const {

Firestore/core/src/api/stages.h

@@ -264,7 +264,7 @@ class ReplaceWith : public Stage {
 
 class Sample : public Stage {
  public:
-  Sample(std::string type, int64_t count, double percentage_);
+  Sample(std::string type, int64_t count, double percentage);
   ~Sample() override = default;
   google_firestore_v1_Pipeline_Stage to_proto() const override;