aw: Destroy ContentViewCore and WebContents together

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 43cbe9286f5a97e1f525bf5b3bb36bc40c10e8dc..73ba3be4be3f4e94cc478ba5d19aacb04036a880 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -103,10 +103,6 @@ public class AwContentsTest extends AwTestBase {
                 createAwTestContainerView(mContentsClient).getAwContents();
         awContents.destroy();
 
-        assertNull(awContents.getWebContents());
-        assertNull(awContents.getContentViewCore());
-        assertNull(awContents.getNavigationController());
-
         // The documentation for WebView#destroy() reads "This method should be called
         // after this WebView has been removed from the view system. No other methods
         // may be called on this WebView after destroy".
@@ -342,8 +338,8 @@ public class AwContentsTest extends AwTestBase {
             pollOnUiThread(new Callable<Boolean>() {
                 @Override
                 public Boolean call() {
-                    return awContents.getFavicon() != null &&
-                        !awContents.getFavicon().sameAs(defaultFavicon);
+                    return awContents.getFavicon() != null
+                            && !awContents.getFavicon().sameAs(defaultFavicon);
                 }
             });