Refactor the translate infobars on mac to match the new windows code.

chrome/browser/translate/translate_infobar_delegate2.h

 // Copyright (c) 2010 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.
 
-#ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H
-#define CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H
+#ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H_
+#define CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H_
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/translate_errors.h"
 
 class SkBitmap;
 class TranslateInfoBarView;
@@ skipping 105 matching lines @@
   // Adds the strings that should be displayed in the after translate infobar to
   // |strings|. The text in that infobar is:
   // "The page has been translated from <lang1> to <lang2>."
   // Because <lang1> and <lang2> are displayed in menu buttons, the text is
   // split in 3 chunks.  |swap_languages| is set to true if <lang1> and <lang2>
   // should be inverted (some languages express the sentense as "The page has
   // been translate to <lang2> from <lang1>.").
   static void GetAfterTranslateStrings(std::vector<string16>* strings,
                                        bool* swap_languages);
 
+ protected:
+  // For testing.
+  TranslateInfoBarDelegate2(Type infobar_type,
+                            TranslateErrors::Type error,
+                            TabContents* tab_contents,
+                            const std::string& original_language,
+                            const std::string& target_language);
+  Type type_;
+
  private:
   typedef std::pair<std::string, string16> LanguageNamePair;
 
   // Gets the host of the page being translated, or an empty string if no URL is
   // associated with the current page.
   std::string GetPageHost();
 
-  TranslateInfoBarDelegate2(Type infobar_type,
-                            TranslateErrors::Type error,
-                            TabContents* tab_contents,
-                            const std::string& original_language,
-                            const std::string& target_language);
-
-  Type type_;
-
   // The type of fading animation if any that should be used when showing this
   // infobar.
   BackgroundAnimationType background_animation_;
 
   TabContents* tab_contents_;
 
   // The list supported languages for translation.
   // The pair first string is the language ISO code (ex: en, fr...), the second
   // string is the displayable name on the current locale.
   // The languages are sorted alphabetically based on the displayable name.
@@ skipping 10 matching lines @@
 
   // The current infobar view.
   TranslateInfoBarView* infobar_view_;
 
   // The translation related preferences.
   TranslatePrefs prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateInfoBarDelegate2);
 };
 
-#endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H
+#endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE2_H_