[ios] More NTP test fixes.

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ie9bbfd3f8b9af31df042735e1cfbbeca2c6a7c95
Reviewed-on: https://chromium-review.googlesource.com/1014736
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552112}

ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm

@@ -231,6 +231,8 @@
   self.NTPMediator = nil;
   self.contentSuggestionsMediator = nil;
   self.headerController = nil;
+  [self.primaryToolbarMediator disconnect];
+  self.primaryToolbarMediator = nil;
   _visible = NO;
 }
 

ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm

@@ -260,7 +260,7 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
   // it for all screen scale.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
                                           FakeOmniboxAccessibilityID())]
-      assertWithMatcher:OmniboxWidthBetween(collectionWidth + 1, 1)];
+      assertWithMatcher:OmniboxWidthBetween(collectionWidth + 1, 2)];
 
   [EarlGrey rotateDeviceToOrientation:UIDeviceOrientationLandscapeLeft
                            errorOrNil:nil];
@@ -273,7 +273,7 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
                                           FakeOmniboxAccessibilityID())]
       assertWithMatcher:OmniboxWidthBetween(collectionWidthAfterRotation + 1,
-                                            1)];
+                                            2)];
 }
 
 // Tests that the promo is correctly displayed and removed once tapped.
@@ -434,7 +434,7 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
 // It is important for ranking algorithm of omnibox that requests from the
 // search button and real omnibox are marked appropriately.
 - (void)testTapOmniboxSearchButtonLogsCorrectly {
-  if (!IsUIRefreshPhase1Enabled() ||
+  if (!IsUIRefreshPhase1Enabled() || !IsRefreshLocationBarEnabled() ||
       content_suggestions::IsRegularXRegularSizeClass()) {
     // This logging only happens on iPhone, since on iPad there's no secondary
     // toolbar.