Simplify the translate infobar code some.

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

 // Copyright (c) 2011 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/memory/scoped_nsobject.h"
 #import "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/app/chrome_command_ids.h"  // For translate menu command ids.
@@ skipping 36 matching lines @@
                                TranslateErrors::Type error,
                                InfoBarTabHelper* infobar_helper,
                                PrefService* prefs)
       : TranslateInfoBarDelegate(type, error, infobar_helper, prefs,
                                  "en", "es") {
     // Start out in the "Before Translate" state.
     type_ = type;
 
   }
 
-  virtual string16 GetDisplayNameForLocale(const std::string& language_code) {
-    return ASCIIToUTF16("Foo");
-  }
-
-  virtual bool IsLanguageBlacklisted() {
-    return false;
-  }
-
-  virtual bool IsSiteBlacklisted() {
-    return false;
-  }
-
-  virtual bool ShouldAlwaysTranslate() {
-    return false;
-  }
-
   MOCK_METHOD0(Translate, void());
   MOCK_METHOD0(RevertTranslation, void());
+
   MOCK_METHOD0(TranslationDeclined, void());
+
+  virtual bool IsLanguageBlacklisted() { return false; }

[sail, 2012/09/19 04:44:06]

should these have OVERRIDE on them?

[Peter Kasting, 2012/09/19 04:53:32]

Yes.  Good catch.

   MOCK_METHOD0(ToggleLanguageBlacklist, void());
+  virtual bool IsSiteBlacklisted() { return false; }
   MOCK_METHOD0(ToggleSiteBlacklist, void());
+  virtual bool ShouldAlwaysTranslate() { return false; }
   MOCK_METHOD0(ToggleAlwaysTranslate, void());
 };
 
 class TranslationInfoBarTest : public CocoaProfileTest {
  public:
   // Each test gets a single Mock translate delegate for the lifetime of
   // the test.
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     tab_contents_.reset(
@@ skipping 170 matching lines @@
     translate_prefs.IncrementTranslationDeniedCount("en");
   }
   CreateInfoBar(TranslateInfoBarDelegate::BEFORE_TRANSLATE);
   BeforeTranslateInfobarController* controller =
       (BeforeTranslateInfobarController*)infobar_controller_.get();
   EXPECT_TRUE([[controller alwaysTranslateButton] superview] == nil);
   EXPECT_TRUE([[controller neverTranslateButton] superview] != nil);
 }
 
 } // namespace