Infobar Componentization Proof of Concept

chrome/browser/managed_mode/managed_mode_interstitial.cc

Index: chrome/browser/managed_mode/managed_mode_interstitial.cc
diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.cc b/chrome/browser/managed_mode/managed_mode_interstitial.cc
index 75dad74f28e6ef8d6a44a6301138f31250ddff08..2871a846de319b9f6193af019eada5a63a8ab041 100644
--- a/chrome/browser/managed_mode/managed_mode_interstitial.cc
+++ b/chrome/browser/managed_mode/managed_mode_interstitial.cc
@@ -11,6 +11,7 @@
 #include "base/values.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
@@ -67,9 +68,12 @@ ManagedModeInterstitial::ManagedModeInterstitial(
       details.previous_url = controller.GetLastCommittedEntry()->GetURL();
     }
     details.type = content::NAVIGATION_TYPE_NEW_PAGE;
-    for (int i = service->infobar_count() - 1; i >= 0; --i) {
-      if (service->infobar_at(i)->delegate()->ShouldExpire(details))
-        service->RemoveInfoBar(service->infobar_at(i));
+    InfoBarManager& manager = service->infobar_manager();
+    for (int i = manager.infobar_count() - 1; i >= 0; --i) {
+      if (manager.infobar_at(i)->delegate()->ShouldExpire(
+              InfoBarService::NavigationDetailsFromLoadCommittedDetails(
+                  details)))
+        manager.RemoveInfoBar(manager.infobar_at(i));
     }
   }