Check that tab switcher is active/inactive before visibility check.

ios/chrome/browser/ui/stack_view/stack_view_egtest.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <XCTest/XCTest.h>
 
 #include "base/ios/block_types.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "base/test/ios/wait_util.h"
@@ skipping 34 matching lines @@
                                               descriptionBlock:describe];
 }
 
 // Returns a matcher for the StackViewController's view.
 id<GREYMatcher> StackView() {
   return ViewMatchingView([chrome_test_util::GetStackViewController() view]);
 }
 
 // Waits for the Stack View to be visible/hidden.
 void CheckForStackViewVisibility(bool visible) {
+  // Wait for the tab switcher to be active or inactive.
+  NSString* activeTabSwitcherDescription =
+      [NSString stringWithFormat:@"Waiting for tab switcher to be %@.",
+                                 visible ? @"active" : @"inactive"];

[Eugene But (OOO till 7-30), 2017/02/23 19:11:25]

I'm confused about mixing is_visible and is_active concepts. Do you want to pick
one?

[kkhorimoto, 2017/03/07 06:46:51]

separated out into two different checks.

+  BOOL (^activeTabSwitcherBlock)
+  () = ^BOOL {

[Eugene But (OOO till 7-30), 2017/02/23 19:11:25]

Is this done by clang format? If so, could you please file a bug against it.

[kkhorimoto, 2017/03/07 06:46:51]

Done.

+    BOOL isActive = chrome_test_util::GetStackViewController() != nil &&

[Eugene But (OOO till 7-30), 2017/02/23 19:11:25]

nit: no need for |!= nil|

[kkhorimoto, 2017/03/07 06:46:51]

Done.

+                    chrome_test_util::IsTabSwitcherActive();
+    return visible ? isActive : !isActive;
+  };
+  GREYCondition* activeTabSwitcherCondition =
+      [GREYCondition conditionWithName:activeTabSwitcherDescription
+                                 block:activeTabSwitcherBlock];
+  [activeTabSwitcherCondition waitWithTimeout:5.0];

[Eugene But (OOO till 7-30), 2017/02/23 19:11:25]

Do you want to use kWaitForUIElementTimeout instead of 5.0?

[kkhorimoto, 2017/03/07 06:46:51]

Done.

+  // Verify the visibility of the stack view.
   id<GREYMatcher> visibilityMatcher =
       grey_allOf(visible ? grey_sufficientlyVisible() : grey_notVisible(),
                  visible ? grey_notNil() : grey_nil(), nil);
   [[EarlGrey selectElementWithMatcher:StackView()]
       assertWithMatcher:visibilityMatcher];
 }
 
 // Opens the StackViewController.
 void OpenStackView() {
   if (chrome_test_util::IsTabSwitcherActive())
@@ skipping 115 matching lines @@
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(identifier)]
       performAction:grey_tap()];
   // Verify that the CardView and its associated Tab were removed.
   [[EarlGrey selectElementWithMatcher:ViewMatchingView(cardView)]
       assertWithMatcher:grey_notVisible()];
   GREYAssertEqual(chrome_test_util::GetMainTabCount(), 0,
                   @"All Tabs should be closed.");
 }
 
 // Tests closing all Tabs in the stack view.
-// TODO(crbug.com/693517): Re-enable this test on simulator.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testCloseAllTabs FLAKY_testCloseAllTabs
-#else
-#define MAYBE_testCloseAllTabs testCloseAllTabs
-#endif
-- (void)MAYBE_testCloseAllTabs {
+- (void)testCloseAllTabs {
   // The StackViewController is only used on iPhones.
   if (IsIPadIdiom())
     EARL_GREY_TEST_SKIPPED(@"Stack view is not used on iPads.");
   // Open an incognito Tab.
   OpenNewIncognitoTabUsingStackView();
   GREYAssertEqual(chrome_test_util::GetIncognitoTabCount(), 1,
                   @"Incognito Tab was not opened.");
   // Open two additional Tabs.
   const NSUInteger kAdditionalTabCount = 2;
   for (NSUInteger i = 0; i < kAdditionalTabCount; ++i)
@@ skipping 43 matching lines @@
       chrome_test_util::GetStackViewController();
   GREYAssert([stackViewController isCurrentSetIncognito],
              @"Incognito deck not selected.");
   // Switch back to the main CardSet and verify that is selected.
   ShowDeckWithType(DeckType::NORMAL);
   GREYAssert(![stackViewController isCurrentSetIncognito],
              @"Normal deck not selected.");
 }
 
 @end