[Android] Call DevToolsServer.destroy where needed

[Aw]DevToolsServer is initialized in AwShellActivity, ChromeApplication,
and WebViewChromiumFactoryProvider. Make sure it is destroyed in the first
two instances. WebView lacks shutdown path, thus we can't do much there.

BUG=368171

Review URL: https://codereview.chromium.org/1559433002

Cr-Commit-Position: refs/heads/master@{#367159}

2 files changed, 13 insertions, 0 deletions

diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
index 3ed04908..deb0ccb 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
@@ -119,6 +119,15 @@ public class AwShellActivity extends Activity {
         }
     }
 
+    @Override
+    public void onDestroy() {
+        if (mDevToolsServer != null) {
+            mDevToolsServer.destroy();
+            mDevToolsServer = null;
+        }
+        super.onDestroy();
+    }
+
     private AwTestContainerView createAwTestContainerView() {
         AwBrowserProcess.start(this);
         AwTestContainerView testContainerView = new AwTestContainerView(this, true);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
index db9d33a..c6b483d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
@@ -327,6 +327,10 @@ public class ChromeApplication extends ContentApplication {
     private void onForegroundActivityDestroyed() {
         if (ApplicationStatus.isEveryActivityDestroyed()) {
             mBackgroundProcessing.onDestroy();
+            if (mDevToolsServer != null) {
+                mDevToolsServer.destroy();
+                mDevToolsServer = null;
+            }
             stopApplicationActivityTracker();
             PartnerBrowserCustomizations.destroy();
             ShareHelper.clearSharedImages(this);