Move sources into firebase::firestore and internal namespaces (#494)

* Move sources into firebase::firestore and internal namespaces

Combine support and core/util packages; this distinction wasn't really
paying its freight.

1 files changed, 5 insertions, 3 deletions

diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
index 2c29bf0..3d30a77 100644
--- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
+++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
@@ -21,7 +21,7 @@
 #import <GRPCClient/GRPCCall+ChannelArg.h>
 #import <GRPCClient/GRPCCall+Tests.h>
 
-#include "Firestore/src/core/util/autoid.h"
+#include "Firestore/core/src/firebase/firestore/util/autoid.h"
 
 #import "Firestore/Source/API/FIRFirestore+Internal.h"
 #import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h"
@@ -32,6 +32,8 @@
 #import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
 #import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h"
 
+using firebase::firestore::util::CreateAutoId;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRFirestore (Testing)
@@ -165,7 +167,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (NSString *)documentPath {
-  std::string autoId = firestore::CreateAutoId();
+  std::string autoId = CreateAutoId();
   return [NSString stringWithFormat:@"test-collection/%s", autoId.c_str()];
 }
 
@@ -174,7 +176,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (FIRCollectionReference *)collectionRef {
-  std::string autoId = firestore::CreateAutoId();
+  std::string autoId = CreateAutoId();
   NSString *collectionName = [NSString stringWithFormat:@"test-collection-%s", autoId.c_str()];
   return [self.db collectionWithPath:collectionName];
 }