Simplify infobar expiry.

chrome/browser/media/protected_media_identifier_infobar_delegate.cc

 // Copyright 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/media/protected_media_identifier_infobar_delegate.h"
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
-#include "content/public/browser/navigation_entry.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
 infobars::InfoBar* ProtectedMediaIdentifierInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages) {
-  const content::NavigationEntry* committed_entry =
-      infobar_service->web_contents()->GetController().GetLastCommittedEntry();
   return infobar_service->AddInfoBar(
       infobar_service->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
           new ProtectedMediaIdentifierInfoBarDelegate(
-              controller, id, requesting_frame,
-              committed_entry ? committed_entry->GetUniqueID() : 0,
-              display_languages))));
+              controller, id, requesting_frame, display_languages))));
 }
 
 
 ProtectedMediaIdentifierInfoBarDelegate::
     ProtectedMediaIdentifierInfoBarDelegate(
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
-    int contents_unique_id,
     const std::string& display_languages)
     : ConfirmInfoBarDelegate(),
       controller_(controller),
       id_(id),
       requesting_frame_(requesting_frame),
-      contents_unique_id_(contents_unique_id),
       display_languages_(display_languages) {
 }
 
 ProtectedMediaIdentifierInfoBarDelegate::
     ~ProtectedMediaIdentifierInfoBarDelegate() {
 }
 
 bool ProtectedMediaIdentifierInfoBarDelegate::Accept() {
   SetPermission(true, true);
   return true;
@@ skipping 15 matching lines @@
 }
 
 int ProtectedMediaIdentifierInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
 }
 
 void ProtectedMediaIdentifierInfoBarDelegate::InfoBarDismissed() {
   SetPermission(false, false);
 }
 
-bool ProtectedMediaIdentifierInfoBarDelegate::ShouldExpireInternal(
-    const NavigationDetails& details) const {
-  // This implementation matches InfoBarDelegate::ShouldExpireInternal(), but
-  // uses the unique ID we set in the constructor instead of that stored in the
-  // base class.
-  return (contents_unique_id_ != details.entry_id) || details.is_reload;
-}
-
 base::string16 ProtectedMediaIdentifierInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
       IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION,
       net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_));
 }
 
 base::string16 ProtectedMediaIdentifierInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_PROTECTED_MEDIA_IDENTIFIER_ALLOW_BUTTON :
       IDS_PROTECTED_MEDIA_IDENTIFIER_DENY_BUTTON);
 }
 
 bool ProtectedMediaIdentifierInfoBarDelegate::Cancel() {
   SetPermission(true, false);
   return true;
 }
 
 base::string16 ProtectedMediaIdentifierInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool ProtectedMediaIdentifierInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
-  const GURL learn_more_url(chrome::kEnhancedPlaybackNotificationLearnMoreURL);
   InfoBarService::WebContentsFromInfoBar(infobar())
       ->OpenURL(content::OpenURLParams(
-          learn_more_url, content::Referrer(),
+          GURL(chrome::kEnhancedPlaybackNotificationLearnMoreURL),
+          content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
   return false; // Do not dismiss the info bar.
 }