gistfile1.txt

===================================================================
--- test/unit/specs/spec_test_runner.ts	(date 1521222146000)
+++ test/unit/specs/spec_test_runner.ts	(date 1521222146000)
@@ -479,9 +479,6 @@
       return step.enableNetwork!
         ? this.doEnableNetwork()
         : this.doDisableNetwork();
-    } else if ('acquirePrimaryLease' in step) {
-      // PORTING NOTE: Only used by web multi-tab tests.
-      return this.doAcquirePrimaryLease();
     } else if ('restart' in step) {
       return this.doRestart();
     } else if ('shutdown' in step) {
@@ -797,14 +794,6 @@
     await this.remoteStore.enableNetwork();
   }
 
-  private async doAcquirePrimaryLease(): Promise<void> {
-    // We drain the queue after running the client metadata refresh task as the
-    // refresh might schedule a primary state callback on the queue as well.
-    return this.queue
-      .runDelayedOperationsEarly(TimerId.ClientMetadataRefresh)
-      .then(() => this.queue.drain());
-  }
-
   private async doShutdown(): Promise<void> {
     await this.remoteStore.shutdown();
     await this.persistence.shutdown();
@@ -1040,7 +1029,6 @@
   }
 }
 
-<<<<<<< HEAD
 /**
  * `Document` mock that implements the `visibilitychange` API used by Firestore.
  */
@@ -1071,10 +1059,6 @@
     if (this.visibilityListener) {
       this.visibilityListener(new Event('visibilitychange'));
     }
-=======
-  protected async destroyPersistence(): Promise<void> {
-    // Nothing to do.
->>>>>>> master
   }
 }