Translate infobar delegate: name the "type_" and "error_" fields "infobar_type_" and "error_type_" …

chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm

Index: chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm
===================================================================
--- chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm	(revision 174909)
+++ chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm	(working copy)
@@ -30,7 +30,7 @@
 // TranslateInfoBarDelegate views specific method:
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
   TranslateInfoBarControllerBase* infobar_controller = NULL;
-  switch (type_) {
+  switch (infobar_type_) {
     case BEFORE_TRANSLATE:
       infobar_controller =
           [[BeforeTranslateInfobarController alloc] initWithDelegate:this
@@ -127,7 +127,8 @@
   if (newLanguageIdxSizeT == [self delegate]->original_language_index())
     return;
   [self delegate]->set_original_language_index(newLanguageIdxSizeT);
-  if ([self delegate]->type() == TranslateInfoBarDelegate::AFTER_TRANSLATE)
+  if ([self delegate]->infobar_type() ==
+      TranslateInfoBarDelegate::AFTER_TRANSLATE)
     [self delegate]->Translate();
   int commandId = IDC_TRANSLATE_ORIGINAL_LANGUAGE_BASE + newLanguageIdx;
   int newMenuIdx = [fromLanguagePopUp_ indexOfItemWithTag:commandId];
@@ -140,7 +141,8 @@
   if (newLanguageIdxSizeT == [self delegate]->target_language_index())
     return;
   [self delegate]->set_target_language_index(newLanguageIdxSizeT);
-  if ([self delegate]->type() == TranslateInfoBarDelegate::AFTER_TRANSLATE)
+  if ([self delegate]->infobar_type() ==
+      TranslateInfoBarDelegate::AFTER_TRANSLATE)
     [self delegate]->Translate();
   int commandId = IDC_TRANSLATE_TARGET_LANGUAGE_BASE + newLanguageIdx;
   int newMenuIdx = [toLanguagePopUp_ indexOfItemWithTag:commandId];
@@ -390,7 +392,7 @@
   if (![self isOwned])
     return;
   TranslateInfoBarDelegate* delegate = [self delegate];
-  TranslateInfoBarDelegate::Type state = delegate->type();
+  TranslateInfoBarDelegate::Type state = delegate->infobar_type();
   DCHECK(state == TranslateInfoBarDelegate::BEFORE_TRANSLATE ||
          state == TranslateInfoBarDelegate::TRANSLATION_ERROR);
   delegate->Translate();
@@ -401,7 +403,8 @@
   if (![self isOwned])
     return;
   TranslateInfoBarDelegate* delegate = [self delegate];
-  DCHECK(delegate->type() == TranslateInfoBarDelegate::BEFORE_TRANSLATE);
+  DCHECK_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
+            delegate->infobar_type());
   delegate->TranslationDeclined();
   [super removeSelf];
 }