Remove remaining dependencies of infobars on content/.

chrome/browser/infobars/infobar_delegate.cc

 // Copyright (c) 2012 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_delegate.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar.h"
-#include "chrome/browser/infobars/infobar_service.h"
-#include "content/public/browser/navigation_controller.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/web_contents.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "ui/base/resource/resource_bundle.h"
 
-using content::NavigationEntry;
-
-// InfoBarDelegate ------------------------------------------------------------
-
 const int InfoBarDelegate::kNoIconID = 0;
 
 InfoBarDelegate::~InfoBarDelegate() {
 }
 
 InfoBarDelegate::InfoBarAutomationType
     InfoBarDelegate::GetInfoBarAutomationType() const {
   return UNKNOWN_INFOBAR;
 }
 
@@ skipping 57 matching lines @@
 ThemeInstalledInfoBarDelegate*
     InfoBarDelegate::AsThemePreviewInfobarDelegate() {
   return NULL;
 }
 
 TranslateInfoBarDelegate* InfoBarDelegate::AsTranslateInfoBarDelegate() {
   return NULL;
 }
 
 void InfoBarDelegate::StoreActiveEntryUniqueID() {
-  // TODO(droger): Remove this dependency on InfoBarService, see
-  // http://crbug.com/354379.
-  content::WebContents* web_contents =
-      InfoBarService::WebContentsFromInfoBar(infobar());
-  DCHECK(web_contents);
-  NavigationEntry* active_entry =
-      web_contents->GetController().GetActiveEntry();
-  contents_unique_id_ = active_entry ? active_entry->GetUniqueID() : 0;
+  int entry_id = 0;
+  if (infobar() && infobar()->owner())
+    entry_id = infobar()->owner()->GetActiveEntryID();

[droger, 2014/04/09 16:10:52]

We could maybe rename StoreActiveEntryUniqueID() and GetActiveEntryID() to
something that is less tied to WebContents.
Something like PageUniqueID maybe?

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

I don't have an opinion.

+  contents_unique_id_ = entry_id;

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

Nit: Shorter:

  contents_unique_id_ = (infobar() && infobar()->owner()) ?
      infobar()->owner()->GetActiveEntryID() : 0;

But given the old code, it seems like this conditional should always be true,
otherwise the old DCHECK would have failed, wouldn't it?

I'd rather not make something conditional that can't actually fail.

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

Done.

 }
 
 gfx::Image InfoBarDelegate::GetIcon() const {
   int icon_id = GetIconID();
   return (icon_id == kNoIconID) ? gfx::Image() :
       ResourceBundle::GetSharedInstance().GetNativeImageNamed(icon_id);
 }
 
 InfoBarDelegate::InfoBarDelegate() : contents_unique_id_(0) {
 }
 
 bool InfoBarDelegate::ShouldExpireInternal(
     const NavigationDetails& details) const {
   // NOTE: If you change this, be sure to check and adjust the behavior of
   // anyone who overrides this as necessary!
   return (contents_unique_id_ != details.entry_id) || details.is_reload;
 }