ContentShell rendering support on Android.

content/shell/shell_browser_main_parts.cc

 // 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.
 
 #include "content/shell/shell_browser_main_parts.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 14 matching lines @@
 #include "net/android/network_change_notifier_factory.h"
 #endif
 
 namespace content {
 
 static GURL GetStartupURL() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kContentBrowserTest))
     return GURL();
   const CommandLine::StringVector& args = command_line->GetArgs();
+
+#if defined(OS_ANDROID)
+  // Delay renderer creation on Android until surface is ready.
+  return GURL();
+#endif
+
   if (args.empty())
     return GURL("http://www.google.com/");
 
   return GURL(args[0]);
 }
 
 ShellBrowserMainParts::ShellBrowserMainParts(
     const MainFunctionParams& parameters)
     : BrowserMainParts(),
       parameters_(parameters),
@@ skipping 66 matching lines @@
 #if defined(USE_AURA)
   Shell::PlatformExit();
 #endif
   if (devtools_delegate_)
     devtools_delegate_->Stop();
   browser_context_.reset();
   off_the_record_browser_context_.reset();
 }
 
 }  // namespace