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

android_webview/native/aw_devtools_server.h

Index: android_webview/native/aw_devtools_server.h
diff --git a/android_webview/native/aw_dev_tools_server.h b/android_webview/native/aw_devtools_server.h
similarity index 69%
rename from android_webview/native/aw_dev_tools_server.h
rename to android_webview/native/aw_devtools_server.h
index eb0217d62e7ca22894781802952da72f5bba4631..6f1f0f0b2c55dc2aaa5724b108cbcc4fe6671ec2 100644
--- a/android_webview/native/aw_dev_tools_server.h
+++ b/android_webview/native/aw_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 ANDROID_WEBVIEW_NATIVE_AW_DEV_TOOLS_SERVER_H_
-#define ANDROID_WEBVIEW_NATIVE_AW_DEV_TOOLS_SERVER_H_
+#ifndef ANDROID_WEBVIEW_NATIVE_AW_DEVTOOLS_SERVER_H_
+#define ANDROID_WEBVIEW_NATIVE_AW_DEVTOOLS_SERVER_H_
 
 #include <jni.h>
 
@@ -12,10 +12,6 @@
 
 #include "base/macros.h"
 
-namespace devtools_http_handler {
-class DevToolsHttpHandler;
-}
-
 namespace android_webview {
 
 // This class controls WebView-specific Developer Tools remote debugging server.
@@ -33,9 +29,7 @@ class AwDevToolsServer {
   bool IsStarted() const;
 
  private:
-  std::unique_ptr<devtools_http_handler::DevToolsHttpHandler>
-      devtools_http_handler_;
-
+  bool is_started_;
   DISALLOW_COPY_AND_ASSIGN(AwDevToolsServer);
 };
 
@@ -43,4 +37,4 @@ bool RegisterAwDevToolsServer(JNIEnv* env);
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_NATIVE_AW_DEV_TOOLS_SERVER_H_
+#endif  // ANDROID_WEBVIEW_NATIVE_AW_DEVTOOLS_SERVER_H_