Merge "Add useMinimalMemory=true test to TileBenchmark"

2 files changed, 21 insertions, 0 deletions

diff --git a/tests/TileBenchmark/src/com/test/tilebenchmark/PerformanceTest.java b/tests/TileBenchmark/src/com/test/tilebenchmark/PerformanceTest.java
index 6356cc1..5763ad3 100644
--- a/tests/TileBenchmark/src/com/test/tilebenchmark/PerformanceTest.java
+++ b/tests/TileBenchmark/src/com/test/tilebenchmark/PerformanceTest.java
@@ -276,6 +276,22 @@ public class PerformanceTest extends
         }
     }
 
+    public void testMetricsMinimalMemory() {
+        mActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mWeb.setUseMinimalMemory(true);
+            }
+        });
+
+        setScrollingTestingMode(true);
+        if (checkMedia() && runTestDirs(SCROLL_TEST_DIRS)) {
+            getInstrumentation().sendStatus(0, mStats.getBundle());
+        } else {
+            getInstrumentation().sendStatus(1, null);
+        }
+    }
+
     private boolean runAnimationTests() {
         for (int doubleBuffer = 0; doubleBuffer <= 1; doubleBuffer++) {
             mDoubleBuffering = doubleBuffer == 1;
diff --git a/tests/TileBenchmark/src/com/test/tilebenchmark/ProfiledWebView.java b/tests/TileBenchmark/src/com/test/tilebenchmark/ProfiledWebView.java
index 7c03313..d3b572c 100644
--- a/tests/TileBenchmark/src/com/test/tilebenchmark/ProfiledWebView.java
+++ b/tests/TileBenchmark/src/com/test/tilebenchmark/ProfiledWebView.java
@@ -89,6 +89,11 @@ public class ProfiledWebView extends WebView implements WebViewClassic.PageSwapD
         mLoadTime = 0;
     }
 
+    public void setUseMinimalMemory(boolean minimal) {
+        WebSettingsClassic settings = getWebViewClassic().getSettings();
+        settings.setProperty("use_minimal_memory", minimal ? "true" : "false");
+    }
+
     public void onPageFinished() {
         mLoadTime = System.currentTimeMillis();
     }