From f4e272324424ad90a48c548644904b147466863c Mon Sep 17 00:00:00 2001
From: Primiano Tucci <primiano@google.com>
Date: Thu, 5 Sep 2013 12:01:51 +0100
Subject: [PATCH] DO NOT MERGE: Adding freeMemoryForTests static method to
 WebView.

This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 244267500254daff8745f8c0fae3edcac735873f)

Cherry pick to klp-dev as part of Bug: 13246014

Conflicts:
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
---
 core/java/android/webkit/WebView.java                | 10 ++++++++++
 core/java/android/webkit/WebViewFactoryProvider.java |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 5bc39f1584084..efdc465c2bd4d 100644
--- a/core/java/android/webkit/WebView.java
+++ b/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
diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java
index 9d9d88292c1ad..e391aafd54658 100644
--- a/core/java/android/webkit/WebViewFactoryProvider.java
+++ b/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) }