Refactor media stream infobar delegate code and also fix a typo

chrome/browser/ui/views/infobars/media_stream_infobar.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 <algorithm>
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
 #include "chrome/browser/ui/views/infobars/media_stream_infobar.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 
 InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   DCHECK(owner);
   return new MediaStreamInfoBar(owner, this);
 }
 
 MediaStreamInfoBar::MediaStreamInfoBar(
     InfoBarTabHelper* owner,
     MediaStreamInfoBarDelegate* delegate)
     : InfoBarView(owner, delegate),
-      delegate_(delegate),
       label_(NULL),
       allow_button_(NULL),
       deny_button_(NULL),
       devices_menu_button_(NULL),
       devices_menu_model_(delegate) {
 }
 
 MediaStreamInfoBar::~MediaStreamInfoBar() {
 }
 
@@ skipping 20 matching lines @@
   gfx::Size devices_size = devices_menu_button_->GetPreferredSize();
   devices_menu_button_->SetBounds(EndX() - devices_size.width(),
       OffsetY(devices_size), devices_size.width(), devices_size.height());
 }
 
 void MediaStreamInfoBar::ViewHierarchyChanged(bool is_add,
                                               views::View* parent,
                                               views::View* child) {
   if (is_add && child == this && (label_ == NULL)) {
     int message_id = IDS_MEDIA_CAPTURE_MIC_AND_VIDEO;
-    DCHECK(delegate_->has_audio() || delegate_->has_video());
-    if (!delegate_->has_audio())
+    DCHECK(GetDelegate()->has_audio() || GetDelegate()->has_video());
+    if (!GetDelegate()->has_audio())
       message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
-    else if (!delegate_->has_video())
+    else if (!GetDelegate()->has_video())
       message_id = IDS_MEDIA_CAPTURE_MIC_ONLY;
 
     label_ = CreateLabel(l10n_util::GetStringFUTF16(message_id,
-        UTF8ToUTF16(delegate_->GetSecurityOrigin())));
+        UTF8ToUTF16(GetDelegate()->GetSecurityOrigin())));
     AddChildView(label_);
 
     allow_button_ = CreateTextButton(this,
         l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_ALLOW), false);
     AddChildView(allow_button_);
 
     deny_button_ = CreateTextButton(this,
         l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_DENY), false);
     AddChildView(deny_button_);
 
@@ skipping 10 matching lines @@
 void MediaStreamInfoBar::ButtonPressed(views::Button* sender,
                                        const views::Event& event) {
   if (!owned())
     return;  // We're closing; don't call anything, it might access the owner.
   if (sender == allow_button_) {
     std::string audio_id, video_id;
     devices_menu_model_.GetSelectedDeviceId(
         content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, &audio_id);
     devices_menu_model_.GetSelectedDeviceId(
         content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, &video_id);
-    delegate_->Accept(audio_id, video_id);
+    GetDelegate()->Accept(audio_id, video_id);
     RemoveSelf();
   } else if (sender == deny_button_) {
-    delegate_->Deny();
+    GetDelegate()->Deny();
     RemoveSelf();
   } else {
     InfoBarView::ButtonPressed(sender, event);
   }
 }
 
 int MediaStreamInfoBar::ContentMinimumWidth() const {
   return
       kEndOfLabelSpacing +
       (allow_button_->GetPreferredSize().width() + kButtonButtonSpacing +
           deny_button_->GetPreferredSize().width()) +
       (kButtonButtonSpacing + devices_menu_button_->GetPreferredSize().width());
 }
 
 void MediaStreamInfoBar::OnMenuButtonClicked(views::View* source,
                                              const gfx::Point& point) {
   if (!owned())
     return;  // We're closing; don't call anything, it might access the owner.
   DCHECK_EQ(devices_menu_button_, source);
   RunMenuAt(&devices_menu_model_, devices_menu_button_,
             views::MenuItemView::TOPRIGHT);
 }
+
+MediaStreamInfoBarDelegate* MediaStreamInfoBar::GetDelegate() {
+  return delegate()->AsMediaStreamInfoBarDelegate();
+}