Refactor media stream infobar delegate code and also fix a typo

chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.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/ui/gtk/infobars/media_stream_infobar_gtk.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/media/media_stream_devices_menu_model.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
 #include "grit/generated_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/l10n/l10n_util.h"
 
 InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   DCHECK(owner);
   return new MediaStreamInfoBarGtk(owner, this);
 }
 
 MediaStreamInfoBarGtk::MediaStreamInfoBarGtk(
     InfoBarTabHelper* owner,
     MediaStreamInfoBarDelegate* delegate)
-    : InfoBarGtk(owner, delegate),
-      delegate_(delegate) {
+    : InfoBarGtk(owner, delegate) {
   devices_menu_model_ = new MediaStreamDevicesMenuModel(delegate);
   Init();
 }
 
 MediaStreamInfoBarGtk::~MediaStreamInfoBarGtk() {
 }
 
 void MediaStreamInfoBarGtk::Init() {
   GtkWidget* hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
   gtk_util::CenterWidgetInHBox(hbox_, hbox, false, 0);
   size_t offset = 0;
 
   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;
 
-  string16 security_origin = UTF8ToUTF16(delegate_->GetSecurityOrigin());
+  string16 security_origin = UTF8ToUTF16(GetDelegate()->GetSecurityOrigin());
   string16 text(l10n_util::GetStringFUTF16(message_id,
                                            security_origin, &offset));
 
   gtk_box_pack_start(GTK_BOX(hbox), CreateLabel(UTF16ToUTF8(text)),
                      FALSE, FALSE, 0);
 
   GtkWidget* button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_MEDIA_CAPTURE_ALLOW).c_str());
   Signals()->Connect(button, "clicked",
                      G_CALLBACK(&OnAllowButtonThunk), this);
@@ skipping 17 matching lines @@
 void MediaStreamInfoBarGtk::OnDevicesClicked(GtkWidget* sender) {
   ShowMenuWithModel(sender, NULL, devices_menu_model_);
 }
 
 void MediaStreamInfoBarGtk::OnAllowButton(GtkWidget* widget) {
   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();
 }
 
 void MediaStreamInfoBarGtk::OnDenyButton(GtkWidget* widget) {
-  delegate_->Deny();
+  GetDelegate()->Deny();
   RemoveSelf();
 }
+
+MediaStreamInfoBarDelegate* MediaStreamInfoBarGtk::GetDelegate() {
+  return delegate()->AsMediaStreamInfoBarDelegate();
+}