[iOS] Create FakeInfobarDelegate.

This is a minimum InfoBarDelegate subclass to use for tests.

Bug: none
Change-Id: Iee4ea0d819ac436ea64b471a166c6399df3cebbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1959664
Auto-Submit: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723619}

ios/chrome/browser/infobars/overlays/BUILD.gn

@@ -37,10 +37,9 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/test",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/infobars:test_support",
-    "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/test:test_support",
     "//ios/web/public/test/fakes",
     "//testing/gtest",

ios/chrome/browser/infobars/overlays/infobar_overlay_request_cancel_handler_unittest.mm

@@ -6,10 +6,10 @@
 
 #include "components/infobars/core/infobar.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
+#include "ios/chrome/browser/infobars/test/fake_infobar_delegate.h"
 #include "ios/chrome/browser/overlays/public/overlay_request.h"
 #include "ios/chrome/browser/overlays/public/overlay_request_queue.h"
 #include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h"
-#import "ios/chrome/browser/ui/infobars/test_infobar_delegate.h"
 #import "ios/web/public/test/fakes/test_navigation_manager.h"
 #import "ios/web/public/test/fakes/test_web_state.h"
 #include "testing/platform_test.h"
@@ -31,10 +31,8 @@ class InfobarOverlayRequestCancelHandlerTest : public PlatformTest {
         std::make_unique<web::TestNavigationManager>());
     InfoBarManagerImpl::CreateForWebState(&web_state_);
     // Create a test InfoBar and add it to the manager.
-    std::unique_ptr<InfoBarDelegate> delegate =
-        std::make_unique<TestInfoBarDelegate>(nil);
     std::unique_ptr<InfoBar> infobar =
-        std::make_unique<InfoBar>(std::move(delegate));
+        std::make_unique<InfoBar>(std::make_unique<FakeInfobarDelegate>());
     infobar_ = infobar.get();
     manager()->AddInfoBar(std::move(infobar));
     // Create a fake OverlayRequest and add it to the infobar banner queue using

ios/chrome/browser/infobars/overlays/infobar_overlay_tab_helper_unittest.mm

@@ -10,10 +10,10 @@
 #include "components/infobars/core/infobar_delegate.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #import "ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory.h"
+#include "ios/chrome/browser/infobars/test/fake_infobar_delegate.h"
 #include "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/overlay_request_queue.h"
 #include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h"
-#import "ios/chrome/browser/ui/infobars/test_infobar_delegate.h"
 #import "ios/web/public/test/fakes/test_navigation_manager.h"
 #import "ios/web/public/test/fakes/test_web_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -28,9 +28,6 @@ using infobars::InfoBarDelegate;
 using infobars::InfoBarManager;
 
 namespace {
-// Message for the fake InfoBar.
-NSString* const kFakeInfoBarMessage = @"Fake Message";
-
 // The pointer value stored in FakeOverlayRequestUserData used to configure
 // banner OverlayRequests created for InfoBars using a fake InfoBarDelegate with
 // kFakeInfoBarMessage.
@@ -82,10 +79,8 @@ class InfobarOverlayTabHelperTest : public PlatformTest {
 // Tests that adding an InfoBar to the manager creates a fake banner request.
 TEST_F(InfobarOverlayTabHelperTest, AddInfoBar) {
   ASSERT_FALSE(front_request());
-  std::unique_ptr<InfoBarDelegate> delegate =
-      std::make_unique<TestInfoBarDelegate>(kFakeInfoBarMessage);
   std::unique_ptr<InfoBar> infobar =
-      std::make_unique<InfoBar>(std::move(delegate));
+      std::make_unique<InfoBar>(std::make_unique<FakeInfobarDelegate>());
   manager()->AddInfoBar(std::move(infobar));
   ASSERT_TRUE(front_request());
 }

ios/chrome/browser/infobars/test/BUILD.gn

+# Copyright 2019 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.
+
+source_set("test") {
+  testonly = true
+  sources = [
+    "fake_infobar_delegate.cc",
+    "fake_infobar_delegate.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//components/infobars/core",
+  ]
+}

ios/chrome/browser/infobars/test/fake_infobar_delegate.cc

+// Copyright 2019 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.
+
+#include "ios/chrome/browser/infobars/test/fake_infobar_delegate.h"
+
+FakeInfobarDelegate::FakeInfobarDelegate() = default;
+
+FakeInfobarDelegate::~FakeInfobarDelegate() = default;
+
+infobars::InfoBarDelegate::InfoBarIdentifier
+FakeInfobarDelegate::GetIdentifier() const {
+  return TEST_INFOBAR;
+}
+
+bool FakeInfobarDelegate::EqualsDelegate(
+    infobars::InfoBarDelegate* delegate) const {
+  return false;
+}

ios/chrome/browser/infobars/test/fake_infobar_delegate.h

+// Copyright 2019 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_TEST_FAKE_INFOBAR_DELEGATE_H_
+#define IOS_CHROME_BROWSER_INFOBARS_TEST_FAKE_INFOBAR_DELEGATE_H_
+
+#include "components/infobars/core/infobar_delegate.h"
+
+// Fake version of InfoBarDelegate.
+class FakeInfobarDelegate : public infobars::InfoBarDelegate {
+ public:
+  FakeInfobarDelegate();
+  ~FakeInfobarDelegate() override;
+
+  // Returns InfoBarIdentifier::TEST_INFOBAR.
+  InfoBarIdentifier GetIdentifier() const override;
+  // Returns false by default.
+  bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override;
+};
+
+#endif  // IOS_CHROME_BROWSER_INFOBARS_TEST_FAKE_INFOBAR_DELEGATE_H_