Revert 50913...

chrome/browser/translate/translate_infobar_delegate2.cc

Index: chrome/browser/translate/translate_infobar_delegate2.cc
===================================================================
--- chrome/browser/translate/translate_infobar_delegate2.cc	(revision 50913)
+++ chrome/browser/translate/translate_infobar_delegate2.cc	(working copy)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/translate/translate_infobar_delegate2.h"
-
 #include <algorithm>
 
+#include "chrome/browser/translate/translate_infobar_delegate2.h"
+
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_process.h"
@@ -83,23 +83,23 @@
   return static_cast<int>(languages_.size());
 }
 
-std::string TranslateInfoBarDelegate2::GetLanguageCodeAt(
+const std::string& TranslateInfoBarDelegate2::GetLanguageCodeAt(
     int index) const {
   DCHECK(index >=0 && index < GetLanguageCount());
   return languages_[index].first;
 }
 
-string16 TranslateInfoBarDelegate2::GetLanguageDisplayableNameAt(
+const string16& TranslateInfoBarDelegate2::GetLanguageDisplayableNameAt(
     int index) const {
   DCHECK(index >=0 && index < GetLanguageCount());
   return languages_[index].second;
 }
 
-std::string TranslateInfoBarDelegate2::GetOriginalLanguageCode() const {
+const std::string& TranslateInfoBarDelegate2::GetOriginalLanguageCode() const {
   return GetLanguageCodeAt(original_language_index());
 }
 
-std::string TranslateInfoBarDelegate2::GetTargetLanguageCode() const {
+const std::string& TranslateInfoBarDelegate2::GetTargetLanguageCode() const {
   return GetLanguageCodeAt(target_language_index());
 }
 
@@ -155,10 +155,6 @@
   UMA_HISTOGRAM_COUNTS("Translate.DeclineTranslateCloseInfobar", 1);
 }
 
-void TranslateInfoBarDelegate2::InfoBarClosed() {
-  delete this;
-}
-
 SkBitmap* TranslateInfoBarDelegate2::GetIcon() const {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_TRANSLATE);