Remove remaining dependencies of infobars on content/.

chrome/browser/infobars/infobar_service.cc

 // Copyright (c) 2013 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 "chrome/browser/infobars/infobar_service.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h"
@@ skipping 37 matching lines @@
 
 InfoBarService::InfoBarService(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
   DCHECK(web_contents);
 }
 
 InfoBarService::~InfoBarService() {
   ShutDown();
 }
 
+int InfoBarService::GetActiveEntryID() {
+  if (!web_contents())

[Peter Kasting, 2014/04/10 00:17:20]

Again, I don't think this conditional is supposed to ever fail.

[droger, 2014/04/10 17:18:07]

Done.

+    return 0;
+  content::NavigationEntry* active_entry =
+      web_contents()->GetController().GetActiveEntry();
+  return active_entry ? active_entry->GetUniqueID() : 0;
+}
+
 void InfoBarService::NotifyInfoBarAdded(InfoBar* infobar) {
   InfoBarManager::NotifyInfoBarAdded(infobar);
   // TODO(droger): Remove the notifications and have listeners change to be
   // NavigationManager::Observers instead. See http://crbug.com/354380
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::Source<InfoBarService>(this),
       content::Details<InfoBar::AddedDetails>(infobar));
 }
 
@@ skipping 52 matching lines @@
 
 void InfoBarService::OnDidBlockDisplayingInsecureContent() {
   InsecureContentInfoBarDelegate::Create(
       this, InsecureContentInfoBarDelegate::DISPLAY);
 }
 
 void InfoBarService::OnDidBlockRunningInsecureContent() {
   InsecureContentInfoBarDelegate::Create(this,
                                          InsecureContentInfoBarDelegate::RUN);
 }