Watch for TabbedModeFRA in FirstRunIntegrationTest.

Since 9c6253e4, TabbedModeFirstRunActivity is sometimes started instead
of FirstRunActivity.

This CL updates FirstRunIntegrationTest to also expect TabbedModeFRA.

Bug: 780429
Change-Id: I74883c7b7719123d0acdee1e4939acf8de22e581
Reviewed-on: https://chromium-review.googlesource.com/749286Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Dmitry Skiba <dskiba@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513287}

chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java

@@ -140,10 +140,13 @@ public class FirstRunIntegrationTest {
         final ActivityMonitor activityMonitor = new ActivityMonitor(asyncClassName, null, false);
         final ActivityMonitor freMonitor =
                 new ActivityMonitor(FirstRunActivity.class.getName(), null, false);
+        final ActivityMonitor tabbedFREMonitor =
+                new ActivityMonitor(TabbedModeFirstRunActivity.class.getName(), null, false);
 
         Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         instrumentation.addMonitor(activityMonitor);
         instrumentation.addMonitor(freMonitor);
+        instrumentation.addMonitor(tabbedFREMonitor);
         runnable.run();
 
         // The original activity should be started because it was directly specified.
@@ -163,7 +166,7 @@ public class FirstRunIntegrationTest {
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
-                return freMonitor.getHits() == 1;
+                return freMonitor.getHits() == 1 || tabbedFREMonitor.getHits() == 1;
             }
         });
     }