DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways.

chrome/browser/android/devtools_server.h

Index: chrome/browser/android/devtools_server.h
diff --git a/chrome/browser/android/dev_tools_server.h b/chrome/browser/android/devtools_server.h
similarity index 71%
rename from chrome/browser/android/dev_tools_server.h
rename to chrome/browser/android/devtools_server.h
index 5f2e515936ad154ad60d7391b2c5c61f710cce4b..67fede70fc9d603acbe5ed5b8a80af7b587d6e82 100644
--- a/chrome/browser/android/dev_tools_server.h
+++ b/chrome/browser/android/devtools_server.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_DEV_TOOLS_SERVER_H_
-#define CHROME_BROWSER_ANDROID_DEV_TOOLS_SERVER_H_
+#ifndef CHROME_BROWSER_ANDROID_DEVTOOLS_SERVER_H_
+#define CHROME_BROWSER_ANDROID_DEVTOOLS_SERVER_H_
 
 #include <jni.h>
 
@@ -12,10 +12,6 @@
 
 #include "base/macros.h"
 
-namespace devtools_http_handler {
-class DevToolsHttpHandler;
-}
-
 // This class controls Developer Tools remote debugging server.
 class DevToolsServer {
  public:
@@ -32,12 +28,11 @@ class DevToolsServer {
 
  private:
   std::string socket_name_;
-  std::unique_ptr<devtools_http_handler::DevToolsHttpHandler>
-      devtools_http_handler_;
+  bool is_started_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsServer);
 };
 
 bool RegisterDevToolsServer(JNIEnv* env);
 
-#endif  // CHROME_BROWSER_ANDROID_DEV_TOOLS_SERVER_H_
+#endif  // CHROME_BROWSER_ANDROID_DEVTOOLS_SERVER_H_