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

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 62 matching lines @@
 #endif
 }
 
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(new ShellBrowserContext(false));
   off_the_record_browser_context_.reset(new ShellBrowserContext(true));
 
   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 =
         command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
     int port;
     if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) {
       devtools_delegate_ = new ShellDevToolsDelegate(
           port,
           browser_context_->GetRequestContext());
     } else {
       DLOG(WARNING) << "Invalid http debugger port number " << port;
     }
   }
+#endif
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     Shell::CreateNewWindow(browser_context_.get(),
                            GetStartupURL(),
                            NULL,
                            MSG_ROUTING_NONE,
                            NULL);
   }
 
   if (parameters_.ui_task) {
@@ skipping 11 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