Remove InfoBarDelegate::web_contents()

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"
@@ skipping 77 matching lines @@
 ThemeInstalledInfoBarDelegate*
     InfoBarDelegate::AsThemePreviewInfobarDelegate() {
   return NULL;
 }
 
 TranslateInfoBarDelegate* InfoBarDelegate::AsTranslateInfoBarDelegate() {
   return NULL;
 }
 
 void InfoBarDelegate::StoreActiveEntryUniqueID() {
-  DCHECK(web_contents());
+  // TODO(droger): Remove this dependency on InfoBarService, see
+  // http://crbug.com/354379.
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());

[blundell, 2014/04/09 12:35:12]

How much larger would it make this CL to change this method to take in the ID
and get rid of this dependency now?

[droger, 2014/04/09 12:44:06]

Not very large, but it will touch more files (InfoBarService and InfoBarManager
at least).
I'll take a closer look.

[droger, 2014/04/09 13:22:54]

This looks like this:
https://codereview.chromium.org/230853002

+  DCHECK(web_contents);
   NavigationEntry* active_entry =
-      web_contents()->GetController().GetActiveEntry();
+      web_contents->GetController().GetActiveEntry();
   contents_unique_id_ = active_entry ? active_entry->GetUniqueID() : 0;
 }
 
 gfx::Image InfoBarDelegate::GetIcon() const {
   int icon_id = GetIconID();
   return (icon_id == kNoIconID) ? gfx::Image() :
       ResourceBundle::GetSharedInstance().GetNativeImageNamed(icon_id);
 }
 
-content::WebContents* InfoBarDelegate::web_contents() {
-  return InfoBarService::WebContentsFromInfoBar(infobar_);
-}
-
 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;
 }