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

content/shell/shell_devtools_delegate_android.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_devtools_delegate.h"
 
-#include <algorithm>
-
+#include "base/stringprintf.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "grit/shell_resources.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/base/unix_domain_socket_posix.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
+namespace {
+
+// TODO(mnaganov): This hardcoded version should be replaced with the webkit
+// revision of this build of content shell. This requires a feature addition
+// to the devtools frontend.
+const char* kFrontendVersion = "21.0.1175.0";

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

I don't see how this requires an additional feature in the devtools front-end.
It rather needs something like chrome::VersionInfo. For the content shell, it
might be passed as a command line argument.

[mnaganov (inactive), 2012/08/02 17:09:57]

I remember we have discussed this and have agreed that WebKit revision can be
used instead of Chrome version. I just need to update frontend hosting first.

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

Sounds good.

+const char kSocketName[] = "content_shell_devtools_remote";
+const char kFrontEndURL[] =
+    "http://chrome-devtools-frontend.appspot.com/static/%s/devtools.html";
+
+}
+
 namespace content {
 
 ShellDevToolsDelegate::ShellDevToolsDelegate(
     int port,
     net::URLRequestContextGetter* context_getter)
     : context_getter_(context_getter) {
   devtools_http_handler_ = DevToolsHttpHandler::Start(
-      new net::TCPListenSocketFactory("127.0.0.1", port),
-      "",
-      context_getter_,
+      new net::UnixDomainSocketWithAbstractNamespaceFactory(
+          kSocketName,
+          base::Bind(&DevToolsHttpHandler::IsUserAllowedToConnect)),

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

Could you define IsUserAllowedToConnect locally?

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

I could, but it is also used by chrome/browser/android/devtools_server.cc hence
placed in the common DevToolsHttpHandler (since it decides who can connect to
the http handler)

+      StringPrintf(kFrontEndURL, kFrontendVersion),
+      context_getter,
       this);
 }
 
 ShellDevToolsDelegate::~ShellDevToolsDelegate() {
 }
 
 void ShellDevToolsDelegate::Stop() {
   // The call below destroys this.
   devtools_http_handler_->Stop();
 }
 
 std::string ShellDevToolsDelegate::GetDiscoveryPageHTML() {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE,
       ui::SCALE_FACTOR_NONE).as_string();
 }
 
 bool ShellDevToolsDelegate::BundlesFrontendResources() {
-  return true;
+  return false;
 }
 
 std::string ShellDevToolsDelegate::GetFrontendResourcesBaseURL() {
   return "";
 }
 
 }  // namespace content