[InfoBar] Upstram basic infobar flow for Android.

chrome/android/testshell/testshell_stubs.cc

Index: chrome/android/testshell/testshell_stubs.cc
diff --git a/chrome/android/testshell/testshell_stubs.cc b/chrome/android/testshell/testshell_stubs.cc
index aec1d7b0d26e9a08c6d766aeec437291ebdbccc7..71ec017e8d12923dabba696903ed30142ad830fe 100644
--- a/chrome/android/testshell/testshell_stubs.cc
+++ b/chrome/android/testshell/testshell_stubs.cc
@@ -3,10 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/strings/string16.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
-#include "chrome/browser/ui/auto_login_infobar_delegate.h"
-#include "chrome/browser/ui/auto_login_infobar_delegate_android.h"
 #include "printing/printing_context.h"
 #include "printing/printing_context_android.h"
 
@@ -17,38 +14,6 @@
 
 class InfoBarService;
 
-// AutoLoginInfoBarDelegatAndroid empty implementation for test_shell
-// TODO(miguelg) remove once the AutoLoginInfoBar is upstreamed.
-AutoLoginInfoBarDelegateAndroid::AutoLoginInfoBarDelegateAndroid(
-    InfoBarService* owner,
-    const AutoLoginInfoBarDelegate::Params& params)
-    : AutoLoginInfoBarDelegate(owner, params), params_() {}
-
-AutoLoginInfoBarDelegateAndroid::~AutoLoginInfoBarDelegateAndroid() {}
-
-bool AutoLoginInfoBarDelegateAndroid::Accept() {
-  return false;
-}
-
-bool AutoLoginInfoBarDelegateAndroid::Cancel() {
-  return false;
-}
-
-base::string16 AutoLoginInfoBarDelegateAndroid::GetMessageText() const {
-  return base::string16();
-}
-
-// static
-bool AutoLoginInfoBarDelegateAndroid::Register(JNIEnv* env) {
-  return false;
-}
-
-// static
-InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
-  NOTREACHED() << "ConfirmInfoBar: InfoBarFactory should be used on Android";
-  return NULL;
-}
-
 // static
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
   return NULL;