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

chrome/browser/android/devtools_server.cc

Index: chrome/browser/android/devtools_server.cc
diff --git a/chrome/browser/android/devtools_server.cc b/chrome/browser/android/devtools_server.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a263e25891f84a91dc6ee8d7ab3c7340c921b51b
--- /dev/null
+++ b/chrome/browser/android/devtools_server.cc
@@ -0,0 +1,107 @@
+// 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 "chrome/browser/android/devtools_server.h"
+
+#include <cstring>
+#include <pwd.h>
+
+#include "base/basictypes.h"
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/compiler_specific.h"
+#include "base/logging.h"
+#include "base/stringprintf.h"
+#include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/chrome_version_info.h"
+#include "content/public/browser/devtools_http_handler.h"
+#include "content/public/browser/devtools_http_handler_delegate.h"
+#include "grit/devtools_discovery_page_resources.h"
+#include "net/base/unix_domain_socket_posix.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "ui/base/resource/resource_bundle.h"
+
+namespace {
+
+const char kFrontEndURL[] =
+    "http://chrome-devtools-frontend.appspot.com/static/%s/devtools.html";

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

I think entire URL should be specified by the embedder.

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

In our case this is the embedder since it is in the chrome/ layer and part of
the chrome-for-android browser code. Do you think it should be passed down by
someone else?

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

I just think that hard-coding particular hosting location this deep could lead
to problems. I'd rather keep it in the Android app's settings. I think it is
fine to land it this way, but I'd rather see it fixed in the long run.

[Satish, 2012/08/06 10:21:41]

This URL will be common between various android targets based on chrome.. e.g.
the clank app, android api provider, a simple chrome/ layer browser app and so
on. So it is an implementation detail that I want to contain within
android/devtools_server.cc and not have each caller know about inner workings of
where devtools frontend is hosted.

+const char kSocketName[] = "chrome_devtools_remote";
+
+// Delegate implementation for the devtools http handler on android. A new
+// instance of this gets created each time devtools is enabled.
+class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
+ public:
+  DevToolsServerDelegate() {
+  }
+
+  virtual std::string GetDiscoveryPageHTML() {
+    // TopSites updates itself after a delay. Ask TopSites to update itself
+    // when we're about to show the remote debugging landing page.
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&DevToolsServerDelegate::PopulatePageThumbnails));
+    return ResourceBundle::GetSharedInstance().GetRawDataResource(
+        IDR_DEVTOOLS_DISCOVERY_PAGE_HTML,
+        ui::SCALE_FACTOR_NONE).as_string();
+  }
+
+  virtual bool BundlesFrontendResources() {
+    return false;
+  }
+
+  virtual std::string GetFrontendResourcesBaseURL() {
+    return "";
+  }
+
+ private:
+  static void PopulatePageThumbnails() {
+    Profile* profile =
+        ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
+    history::TopSites* top_sites = profile->GetTopSites();
+    if (top_sites)
+      top_sites->SyncWithHistory();
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(DevToolsServerDelegate);
+};
+
+}  // namespace
+
+DevToolsServer::DevToolsServer() : protocol_handler_(NULL) {
+}
+
+DevToolsServer::~DevToolsServer() {
+  Stop();
+}
+
+void DevToolsServer::Start() {
+  if (protocol_handler_)
+    return;
+
+  chrome::VersionInfo version_info;
+  Profile* profile = ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
+
+  protocol_handler_ = content::DevToolsHttpHandler::Start(
+      new net::UnixDomainSocketWithAbstractNamespaceFactory(
+          kSocketName,
+          base::Bind(&content::DevToolsHttpHandler::IsUserAllowedToConnect)),
+      StringPrintf(kFrontEndURL, version_info.Version().c_str()),
+      profile->GetRequestContext(),
+      new DevToolsServerDelegate());
+}
+
+void DevToolsServer::Stop() {
+  if (!protocol_handler_)
+    return;
+  // Note that the call to Stop() below takes care of |protocol_handler_|
+  // deletion.
+  protocol_handler_->Stop();
+  protocol_handler_ = NULL;
+}
+
+bool DevToolsServer::IsStarted() const {
+  return protocol_handler_;
+}