Implement the skeleton of an android content shell.

Many TODOs here that will allow a quicker distribution of work to get the
remaining pieces upstreamed.

BUG=118591
TEST=


Review URL: http://codereview.chromium.org/10035034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133857 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 0 deletions

diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index f1343d9..fb13b55 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -5,6 +5,7 @@
 #include "content/shell/shell_browser_main.h"
 
 #include "base/command_line.h"
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
@@ -17,6 +18,12 @@
 namespace {
 
 GURL GetURLForLayoutTest(const char* test_name) {
+#if defined(OS_ANDROID)
+  // DumpRenderTree is not currently supported for Android using the content
+  // shell.
+  NOTIMPLEMENTED();
+  return GURL::EmptyGURL();
+#else
   std::string path_or_url = test_name;
   std::string pixel_hash;
   std::string timeout;
@@ -38,6 +45,7 @@ GURL GetURLForLayoutTest(const char* test_name) {
     webkit_support::SetCurrentDirectoryForFileURL(test_url);
   }
   return test_url;
+#endif
 }
 
 }  // namespace
@@ -48,6 +56,14 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) {
       content::BrowserMainRunner::Create());
 
   int exit_code = main_runner_->Initialize(parameters);
+
+#if defined(OS_ANDROID)
+  DCHECK(exit_code < 0);
+
+  // Return 0 so that we do NOT trigger the default behavior. On Android, the
+  // UI message loop is managed by the Java application.
+  return 0;
+#else
   if (exit_code >= 0)
     return exit_code;
 
@@ -85,4 +101,5 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) {
   main_runner_->Shutdown();
 
   return exit_code;
+#endif
 }