gistfile1.txt

===================================================================
--- test/unit/specs/spec_builder.ts	(date 1521229074000)
+++ test/unit/specs/spec_builder.ts	(date 1521229074000)
@@ -196,7 +196,6 @@
     return this;
   }
 
-<<<<<<< HEAD
   // PORTING NOTE: Only used by web multi-tab tests.
   becomeHidden(): SpecBuilder {
     this.nextStep();
@@ -212,11 +211,12 @@
     this.currentStep = {
       applyClientState: { visibility: 'visible' }
     };
-=======
+    return this;
+  }
+
   runTimer(timerId: TimerId) {
     this.nextStep();
     this.currentStep = { runTimer: timerId };
->>>>>>> master
     return this;
   }
 
@@ -260,17 +260,6 @@
     this.resetInMemoryState();
     return this;
   }
-
-  // TODO: Replace with .runTimer(TimerId.ClientStateRefresh) once #412 is
-  // merged.
-  // PORTING NOTE: Only used by web multi-tab tests.
-  tryAcquirePrimaryLease(): SpecBuilder {
-    this.nextStep();
-    this.currentStep = {
-      acquirePrimaryLease: true
-    };
-    return this;
-  }
 
   shutdown(): SpecBuilder {
     this.nextStep();
@@ -791,6 +780,11 @@
     super.becomeVisible();
     return this;
   }
+
+  runTimer(timerId: TimerId) {
+    super.runTimer(timerId);
+    return this;
+  }
 
   changeUser(uid: string | null): MultiClientSpecBuilder {
     super.changeUser(uid);
@@ -811,11 +805,6 @@
     super.restart();
     return this;
   }
-
-  tryAcquirePrimaryLease(): MultiClientSpecBuilder {
-    super.tryAcquirePrimaryLease();
-    return this;
-  }
 
   expectActiveTargets(...targets): MultiClientSpecBuilder {
     super.expectActiveTargets(...targets);