Minor infobar cleanup.

chrome/browser/gpu/three_d_api_observer.cc

 // Copyright 2014 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/gpu/three_d_api_observer.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 21 matching lines @@
     RELOADED,
     CLOSED_WITHOUT_ACTION,
     DISMISSAL_MAX
   };
 
   ThreeDAPIInfoBarDelegate(const GURL& url, content::ThreeDAPIType requester);
   ~ThreeDAPIInfoBarDelegate() override;
 
   // ConfirmInfoBarDelegate:
   bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override;
+  ThreeDAPIInfoBarDelegate* AsThreeDAPIInfoBarDelegate() override;
   int GetIconID() const override;
   base::string16 GetMessageText() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
   base::string16 GetLinkText() const override;
   bool LinkClicked(WindowOpenDisposition disposition) override;
 
   GURL url_;
   content::ThreeDAPIType requester_;
@@ skipping 26 matching lines @@
       action_taken_(false) {
 }
 
 ThreeDAPIInfoBarDelegate::~ThreeDAPIInfoBarDelegate() {
   if (message_text_queried_ && !action_taken_) {
     UMA_HISTOGRAM_ENUMERATION("GPU.ThreeDAPIInfoBarDismissal",
                               CLOSED_WITHOUT_ACTION, DISMISSAL_MAX);
   }
 }
 
+ThreeDAPIInfoBarDelegate*
+    ThreeDAPIInfoBarDelegate::AsThreeDAPIInfoBarDelegate() {
+  return this;
+}
+
 bool ThreeDAPIInfoBarDelegate::EqualsDelegate(
     infobars::InfoBarDelegate* delegate) const {
   // For the time being, if a given web page is actually using both
   // WebGL and Pepper 3D and both APIs are blocked, just leave the
   // first infobar up. If the user selects "try again", both APIs will
   // be unblocked and the web page reload will succeed.
-  return delegate->GetIconID() == GetIconID();
+  return !!delegate->AsThreeDAPIInfoBarDelegate();
 }
 
 int ThreeDAPIInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_3D_BLOCKED;
 }
 
 base::string16 ThreeDAPIInfoBarDelegate::GetMessageText() const {
   message_text_queried_ = true;
 
   base::string16 api_name;
@@ skipping 63 matching lines @@
                                        int render_process_id,
                                        int render_view_id,
                                        content::ThreeDAPIType requester) {
   content::WebContents* web_contents = tab_util::GetWebContentsByID(
       render_process_id, render_view_id);
   if (!web_contents)
     return;
   ThreeDAPIInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents), url, requester);
 }