aw: Destroy ContentViewCore and WebContents together

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

 // Copyright 2012 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.
 
 package org.chromium.android_webview.test;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.os.Handler;
@@ skipping 85 matching lines @@
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     @UiThreadTest
     public void testWebViewApisFailGracefullyAfterDestruction() throws Throwable {
         AwContents awContents =
                 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".
         // However, some apps do not respect that restriction so we need to ensure that
         // we fail gracefully and do not crash when APIs are invoked after destruction.
         // Due to the large number of APIs we only test a representative selection here.
         awContents.clearHistory();
         awContents.loadUrl(new LoadUrlParams("http://www.google.com"));
         awContents.findAllAsync("search");
         assertNull(awContents.getUrl());
@@ skipping 215 matching lines @@
             // The getFavicon will return the right icon a certain time after
             // the page load completes which makes it slightly hard to test.
             final Bitmap defaultFavicon = awContents.getFavicon();
 
             getAwSettingsOnUiThread(awContents).setImagesEnabled(true);
             loadUrlSync(awContents, mContentsClient.getOnPageFinishedHelper(), pageUrl);
 
             pollOnUiThread(new Callable<Boolean>() {
                 @Override
                 public Boolean call() {
-                    return awContents.getFavicon() != null &&
-                        !awContents.getFavicon().sameAs(defaultFavicon);
+                    return awContents.getFavicon() != null
+                            && !awContents.getFavicon().sameAs(defaultFavicon);
                 }
             });
 
             final Object originalFaviconSource = (new URL(faviconUrl)).getContent();
             final Bitmap originalFavicon =
                     BitmapFactory.decodeStream((InputStream) originalFaviconSource);
             assertNotNull(originalFavicon);
 
             assertTrue(awContents.getFavicon().sameAs(originalFavicon));
 
@@ skipping 141 matching lines @@
                 Header[] matchingHeaders = request.getHeaders(header);
                 assertEquals("header " + header + " not found", 1, matchingHeaders.length);
                 assertEquals(value.getValue(), matchingHeaders[0].getValue());
             }
         } finally {
             webServer.shutdown();
         }
     }
 
 }