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

chrome/app/android/chrome_main_delegate_android.h

Index: chrome/app/android/chrome_main_delegate_android.h
diff --git a/chrome/app/android/chrome_main_delegate_android.h b/chrome/app/android/chrome_main_delegate_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..d72766f3d590cce7e923ba9126b852173ac0a903
--- /dev/null
+++ b/chrome/app/android/chrome_main_delegate_android.h
@@ -0,0 +1,36 @@
+// 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_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
+#define CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
+
+#include "chrome/app/chrome_main_delegate.h"
+#include "content/public/browser/browser_main_runner.h"
+
+// Android override of ChromeMainDelegate
+class ChromeMainDelegateAndroid : public ChromeMainDelegate {
+ public:
+  ChromeMainDelegateAndroid();
+  virtual ~ChromeMainDelegateAndroid();
+
+  // Set up the JNI bindings.  Tie the Java methods with their native
+  // counterparts.  Override to add more JNI bindings.
+  virtual bool RegisterApplicationNativeMethods(JNIEnv* env);
+
+ protected:
+  virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
+
+  virtual void SandboxInitialized(const std::string& process_type) OVERRIDE;
+
+  virtual int RunProcess(
+      const std::string& process_type,
+      const content::MainFunctionParams& main_function_params) OVERRIDE;
+
+ private:
+  scoped_ptr<content::BrowserMainRunner> browser_runner_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid);
+};
+
+#endif  // CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_