Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/android/testshell/chrome_main_delegate_testshell_android.h

Index: chrome/android/testshell/chrome_main_delegate_testshell_android.h
diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.h b/chrome/android/testshell/chrome_main_delegate_testshell_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..0c57ae67c4698e54f5e5d6875c1871b7fca0b302
--- /dev/null
+++ b/chrome/android/testshell/chrome_main_delegate_testshell_android.h
@@ -0,0 +1,21 @@
+// Copyright (c) 2012 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_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+#define CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+
+#include "chrome/app/android/chrome_main_delegate_android.h"
+
+class ChromeMainDelegateTestShellAndroid : public ChromeMainDelegateAndroid {
+ public:
+  ChromeMainDelegateTestShellAndroid();
+  virtual ~ChromeMainDelegateTestShellAndroid();
+
+  virtual bool RegisterApplicationNativeMethods(JNIEnv* env) OVERRIDE;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateTestShellAndroid);
+};
+
+#endif  // CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_