Simplify devtools code on android and enable devtools for android content_shell.

content/shell/shell_browser_main_parts.cc

Index: content/shell/shell_browser_main_parts.cc
diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc
index b8ba066f32abb610032b004f9c3d70bacb75eee2..7ea17282c268b20ae84719a1b5938605ab8564a1 100644
--- a/content/shell/shell_browser_main_parts.cc
+++ b/content/shell/shell_browser_main_parts.cc
@@ -80,6 +80,11 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
   Shell::PlatformInitialize();
   net::NetModule::SetResourceProvider(Shell::PlatformResourceProvider);
 
+#if defined(OS_ANDROID)
+  devtools_delegate_ = new ShellDevToolsDelegate(

[pfeldman, 2012/08/02 17:05:50]

So you want to always have remote debugging-enabled shell for Android?

[Satish, 2012/08/02 17:17:53]

For content shell, yes because it is aimed towards developers and not a
shippable product

[pfeldman, 2012/08/02 17:37:53]

Sounds good.

+      0,  // On android the port number isn't used.
+      browser_context_->GetRequestContext());
+#else
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kRemoteDebuggingPort)) {
     std::string port_str =
@@ -93,6 +98,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
       DLOG(WARNING) << "Invalid http debugger port number " << port;
     }
   }
+#endif
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     Shell::CreateNewWindow(browser_context_.get(),