- Removed the message loop from shell_browser_main_parts.cc. We don't need

  that code as the message loop will be initialized by BrowserMainRunner.

- Cleared the unused code in shell_browser_main.cc


BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10536018

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

1 files changed, 0 insertions, 8 deletions

diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index 01c68e3..f56af33 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -59,13 +59,6 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) {
 
   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;
 
@@ -115,5 +108,4 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) {
   main_runner_->Shutdown();
 
   return exit_code;
-#endif
 }