[ios] Deletes InfobarContainerDelegates

Since the InfobarView is no longer communicating its size to Infobar.cc
there's no need to have the machinery necessary so Infobar.cc communicates
with our InfobarContainerView.

The InfobarContainerView will be updated via the VC viewDidLayoutSubviews
which was the change made on https://crrev.com/c/1321849/

Adds an extra test case.

Bug: 892376
Change-Id: I5457c17a8e1e586b02b5ca9906abd4341e5a56d4
Reviewed-on: https://chromium-review.googlesource.com/c/1325034Reviewed-by: Mark Cogan <marq@chromium.org>
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606911}

ios/chrome/browser/infobars/BUILD.gn

@@ -10,11 +10,8 @@ source_set("infobars") {
     "confirm_infobar_controller.mm",
     "infobar.h",
     "infobar.mm",
-    "infobar_container_delegate_ios.h",
-    "infobar_container_delegate_ios.mm",
     "infobar_container_ios.h",
     "infobar_container_ios.mm",
-    "infobar_container_state_delegate.h",
     "infobar_controller+protected.h",
     "infobar_controller.h",
     "infobar_controller.mm",

ios/chrome/browser/infobars/infobar_container_delegate_ios.h

-// Copyright 2017 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.
-
-#ifndef IOS_CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_DELEGATE_IOS_H_
-#define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_DELEGATE_IOS_H_
-
-#import <Foundation/Foundation.h>
-
-#include "components/infobars/core/infobar_container.h"
-#include "third_party/skia/include/core/SkColor.h"
-
-@protocol InfobarContainerStateDelegate;
-
-// iOS implementation of InfoBarContainer::Delegate. Most of the method
-// implementations are no-ops, since the iOS UI should not be driven or managed
-// by the cross-platform infobar code.
-class InfoBarContainerDelegateIOS
-    : public infobars::InfoBarContainer::Delegate {
- public:
-  explicit InfoBarContainerDelegateIOS(
-      id<InfobarContainerStateDelegate> delegate)
-      : delegate_(delegate) {}
-
-  ~InfoBarContainerDelegateIOS() override {}
-
-  // Informs |delegate_| that the container state has changed.
-  void InfoBarContainerStateChanged(bool is_animating) override;
-
- private:
-  __weak id<InfobarContainerStateDelegate> delegate_;
-};
-
-#endif  // IOS_CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_DELEGATE_IOS_H_

ios/chrome/browser/infobars/infobar_container_delegate_ios.mm

-// Copyright 2017 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 "ios/chrome/browser/infobars/infobar_container_delegate_ios.h"
-
-#include "base/logging.h"
-#include "ios/chrome/browser/infobars/infobar_container_state_delegate.h"
-#include "ui/gfx/animation/slide_animation.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-void InfoBarContainerDelegateIOS::InfoBarContainerStateChanged(
-    bool is_animating) {
-  [delegate_ infoBarContainerStateDidChangeAnimated:is_animating];
-}

ios/chrome/browser/infobars/infobar_container_ios.h

@@ -17,8 +17,7 @@
 // that only the front most one is visible at any time.
 class InfoBarContainerIOS : public infobars::InfoBarContainer {
  public:
-  InfoBarContainerIOS(infobars::InfoBarContainer::Delegate* delegate,
-                      id<InfobarContainerConsumer> consumer);
+  InfoBarContainerIOS(id<InfobarContainerConsumer> consumer);
   ~InfoBarContainerIOS() override;
 
  protected:
@@ -28,7 +27,6 @@ class InfoBarContainerIOS : public infobars::InfoBarContainer {
   void PlatformSpecificInfoBarStateChanged(bool is_animating) override;
 
  private:
-  InfoBarContainer::Delegate* delegate_;
   id<InfobarContainerConsumer> consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainerIOS);

ios/chrome/browser/infobars/infobar_container_ios.mm

@@ -4,9 +4,6 @@
 
 #include "ios/chrome/browser/infobars/infobar_container_ios.h"
 
-#include <stddef.h>
-
-#include "base/logging.h"
 #include "ios/chrome/browser/infobars/infobar.h"
 #import "ios/chrome/browser/ui/infobars/infobar_container_consumer.h"
 
@@ -14,15 +11,10 @@
 #error "This file requires ARC support."
 #endif
 
-InfoBarContainerIOS::InfoBarContainerIOS(
-    infobars::InfoBarContainer::Delegate* delegate,
-    id<InfobarContainerConsumer> consumer)
-    : InfoBarContainer(delegate), delegate_(delegate), consumer_(consumer) {
-  DCHECK(delegate);
-}
+InfoBarContainerIOS::InfoBarContainerIOS(id<InfobarContainerConsumer> consumer)
+    : InfoBarContainer(nullptr), consumer_(consumer) {}
 
 InfoBarContainerIOS::~InfoBarContainerIOS() {
-  delegate_ = nullptr;
   RemoveAllInfoBarsForDestruction();
 }
 
@@ -36,13 +28,6 @@ void InfoBarContainerIOS::PlatformSpecificRemoveInfoBar(
     infobars::InfoBar* infobar) {
   InfoBarIOS* infobar_ios = static_cast<InfoBarIOS*>(infobar);
   infobar_ios->RemoveView();
-  // If computed_height() is 0, then the infobar was removed after an animation.
-  // In this case, signal the delegate that the state changed.
-  // Otherwise, the infobar is being replaced by another one. Do not call the
-  // delegate in this case, as the delegate will be updated when the new infobar
-  // is added.
-  if (infobar->computed_height() == 0 && delegate_)
-    delegate_->InfoBarContainerStateChanged(false);
 }
 
 void InfoBarContainerIOS::PlatformSpecificInfoBarStateChanged(

ios/chrome/browser/infobars/infobar_container_state_delegate.h

-// Copyright 2017 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.
-
-#ifndef IOS_CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_STATE_DELEGATE_H_
-#define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_STATE_DELEGATE_H_
-
-#import <Foundation/Foundation.h>
-
-// Delegate protocol for an object that is informed of events relating to the
-// state of the infobar container.
-@protocol InfobarContainerStateDelegate
-
-// Tells the delegate that the infobar container's state changed. If |animated|
-// is YES, the state change happened as part of an animation.
-- (void)infoBarContainerStateDidChangeAnimated:(BOOL)animated;
-
-@end
-
-#endif  // IOS_CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_STATE_DELEGATE_H_

ios/chrome/browser/ui/infobars/infobar_container_mediator.mm

@@ -4,9 +4,7 @@
 
 #import "ios/chrome/browser/ui/infobars/infobar_container_mediator.h"
 
-#include "ios/chrome/browser/infobars/infobar_container_delegate_ios.h"
 #include "ios/chrome/browser/infobars/infobar_container_ios.h"
-#include "ios/chrome/browser/infobars/infobar_container_state_delegate.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
@@ -23,11 +21,8 @@
 #error "This file requires ARC support."
 #endif
 
-@interface InfobarContainerMediator ()<InfobarContainerStateDelegate,
-                                       TabModelObserver,
+@interface InfobarContainerMediator ()<TabModelObserver,
                                        WebStateListObserving> {
-  // Bridge class to deliver container change notifications.
-  std::unique_ptr<InfoBarContainerDelegateIOS> _infoBarContainerDelegate;
   // A single infobar container handles all infobars in all tabs. It keeps
   // track of infobars for current tab (accessed via infobar helper of
   // the current tab).
@@ -61,9 +56,7 @@
     _tabModel = tabModel;
     _webStateList = _tabModel.webStateList;
 
-    _infoBarContainerDelegate.reset(new InfoBarContainerDelegateIOS(self));
-    _infoBarContainer.reset(
-        new InfoBarContainerIOS(_infoBarContainerDelegate.get(), _consumer));
+    _infoBarContainer.reset(new InfoBarContainerIOS(_consumer));
     infobars::InfoBarManager* infoBarManager = nullptr;
     if (_tabModel.currentTab) {
       DCHECK(_tabModel.currentTab.webState);
@@ -85,12 +78,6 @@
   _webStateListObserver.reset();
 }
 
-#pragma mark - InfobarContainerStateDelegate
-
-- (void)infoBarContainerStateDidChangeAnimated:(BOOL)animated {
-  [self.consumer updateLayoutAnimated:animated];
-}
-
 #pragma mark - TabModelObserver
 
 // TODO(crbug.com/892376): Stop observing TabModel and use WebStateList instead.

ios/chrome/browser/ui/infobars/infobar_coordinator.h

@@ -7,8 +7,6 @@
 
 #import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 
-#import "ios/chrome/browser/infobars/infobar_container_state_delegate.h"
-
 namespace infobars {
 class InfoBarManager;
 }

ios/chrome/browser/ui/infobars/infobar_egtest.mm

@@ -56,7 +56,7 @@ bool AddTestInfoBarToCurrentTabWithMessage(NSString* message) {
 // on the current tab.
 void VerifyTestInfoBarVisibleForCurrentTab(bool visible, NSString* message) {
   id<GREYMatcher> expected_visibility =
-      visible ? grey_sufficientlyVisible() : grey_notVisible();
+      visible ? grey_minimumVisiblePercent(1.0f) : grey_notVisible();
   NSString* condition_name =
       visible ? @"Waiting for infobar to show" : @"Waiting for infobar to hide";
 
@@ -222,6 +222,38 @@ void VerifyNumberOfInfobarsInManager(size_t number_of_infobars) {
   VerifyNumberOfInfobarsInManager(2);
 }
 
+// Tests that a taller Infobar layout is correct and the OK button is tappable.
+- (void)testInfobarTallerLayout {
+  web::test::SetUpFileBasedHttpServer();
+
+  // Open a new tab and navigate to the test page.
+  const GURL testURL = web::test::HttpServer::MakeUrl(
+      "http://ios/testing/data/http_server_files/pony.html");
+  [ChromeEarlGrey loadURL:testURL];
+  [ChromeEarlGrey waitForMainTabCount:1];
+
+  // Infobar Message
+  NSString* firstInfoBarMessage =
+      @"This is a really long message that will cause this infobar height to "
+      @"increase since Confirm Infobar heights changes depending on its "
+      @"message.";
+
+  // Add a test infobar to the current tab. Verify that the infobar is present
+  // in the model and that the infobar view is visible on screen.
+  GREYAssert(AddTestInfoBarToCurrentTabWithMessage(firstInfoBarMessage),
+             @"Failed to add infobar to test tab.");
+  VerifyTestInfoBarVisibleForCurrentTab(true, firstInfoBarMessage);
+  VerifyNumberOfInfobarsInManager(1);
+
+  // Dismiss the Infobar.
+  [[EarlGrey
+      selectElementWithMatcher:grey_allOf(grey_buttonTitle(@"OK"),
+                                          grey_sufficientlyVisible(), nil)]
+      performAction:grey_tap()];
+  VerifyTestInfoBarVisibleForCurrentTab(false, firstInfoBarMessage);
+  VerifyNumberOfInfobarsInManager(0);
+}
+
 // Tests that adding an Infobar of lower height on top of a taller Infobar only
 // displays the top shorter one, and that after dismissing the shorter Infobar
 // the taller infobar is now completely displayed again.