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

android_webview/android_webview.gyp

 # Copyright 2009 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.
 {
   'variables': {
     'chromium_code': 1,
     'system_webview_package_name%': 'com.android.webview',
   },
   'targets': [
     {
@@ skipping 275 matching lines @@
         'browser/aw_browser_permission_request_delegate.h',
         'browser/aw_browser_policy_connector.cc',
         'browser/aw_browser_policy_connector.h',
         'browser/aw_content_browser_client.cc',
         'browser/aw_content_browser_client.h',
         'browser/aw_contents_client_bridge_base.cc',
         'browser/aw_contents_client_bridge_base.h',
         'browser/aw_contents_io_thread_client.h',
         'browser/aw_cookie_access_policy.cc',
         'browser/aw_cookie_access_policy.h',
-        'browser/aw_dev_tools_discovery_provider.cc',
-        'browser/aw_dev_tools_discovery_provider.h',
+        'browser/aw_devtools_manager_delegate.cc',
+        'browser/aw_devtools_manager_delegate.h',
         'browser/aw_download_manager_delegate.cc',
         'browser/aw_download_manager_delegate.h',
         'browser/aw_form_database_service.cc',
         'browser/aw_form_database_service.h',
         'browser/aw_gl_surface.cc',
         'browser/aw_gl_surface.h',
         'browser/aw_http_auth_handler_base.cc',
         'browser/aw_http_auth_handler_base.h',
         'browser/aw_javascript_dialog_manager.cc',
         'browser/aw_javascript_dialog_manager.h',
@@ skipping 209 matching lines @@
           'includes': [ 'apk/system_webview_apk_common.gypi' ],
         },
       ],
     }]
   ],
   'includes': [
     'android_webview_tests.gypi',
     'apk/system_webview_paks.gypi',
   ],
 }