Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev

core/java/android/webkit/WebView.java

@@ -685,6 +685,16 @@ public class WebView extends AbsoluteLayout
         getFactory().getStatics().setPlatformNotificationsEnabled(false);
     }
 
+    /**
+     * Used only by internal tests to free up memory.
+     *
+     * @hide
+     */
+    public static void freeMemoryForTests() {
+        checkThread();
+        getFactory().getStatics().freeMemoryForTests();
+    }
+
     /**
      * Informs WebView of the network state. This is used to set
      * the JavaScript property window.navigator.isOnline and

core/java/android/webkit/WebViewFactoryProvider.java

@@ -49,6 +49,11 @@ public interface WebViewFactoryProvider {
          */
         String getDefaultUserAgent(Context context);
 
+        /**
+         * Used for tests only.
+         */
+         void freeMemoryForTests();
+
         /**
          * Implements the API method:
          * {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) }