Cleanup upstreamed Android infobar code.

chrome/browser/ui/android/infobars/confirm_infobar.h

Index: chrome/browser/ui/android/infobars/confirm_infobar.h
===================================================================
--- chrome/browser/ui/android/infobars/confirm_infobar.h	(revision 225273)
+++ chrome/browser/ui/android/infobars/confirm_infobar.h	(working copy)
@@ -7,30 +7,22 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/android/infobars/infobar_android.h"
 
-class ConfirmInfoBarDelegate;
-
-namespace gfx {
-class Image;
-}
-
-// Implementation of InfoBar for confirm infobars, this currently
-// includes, geolocation, popups..
 class ConfirmInfoBar : public InfoBarAndroid {
  public:
   ConfirmInfoBar(InfoBarService* owner, InfoBarDelegate* delegate);
   virtual ~ConfirmInfoBar();
 
  private:
-  // InfoBar overrides.
+  // InfoBarAndroid:
   virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
       JNIEnv* env) OVERRIDE;
   virtual void ProcessButton(int action,
                              const std::string& action_value) OVERRIDE;
 
-  string16 GetTextFor(ActionType action);
-  string16 GetMessage();
+  string16 GetTextFor(ConfirmInfoBarDelegate::InfoBarButton button);
 
   ConfirmInfoBarDelegate* delegate_;
   base::android::ScopedJavaGlobalRef<jobject> java_confirm_delegate_;
@@ -38,7 +30,7 @@
   DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBar);
 };
 
-// Registers native methods
+// Registers native methods.
 bool RegisterConfirmInfoBarDelegate(JNIEnv* env);
 
 #endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_CONFIRM_INFOBAR_H_