commit 17cd884446d243f8ef74b99ef9d617699953419a
author Primiano Tucci <primiano@google.com> Wed Oct 16 15:28:34 2013 +0100
committer Primiano Tucci <primiano@google.com> Wed Oct 16 15:28:34 2013 +0100
tree cdcd2ce599b525534c2407efd4c0c836efdfd5bf
parent becadfeac509ca2253520ceb46b7b0b59b85a66b

Re-enable synthetic memory signal for pagecycler tests.

This was commented out last week to unlock the automerger
due to some changes upstream, which have been resynced.

Change-Id: Iccaaae5ceff11b0cbf90c30d1a2aa3b325197716

chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index abc75f7..6245ebf 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -210,11 +210,10 @@
 
                     @Override
                     public void freeMemoryForTests() {
-                        // TODO(primiano): temporarily commented out to unlock the automerger.
-                        // if (ActivityManager.isRunningInTestHarness()) {
-                        //     MemoryPressureListener.simulateMemoryPressureSignal(
-                        //             ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-                        // }
+                        if (ActivityManager.isRunningInTestHarness()) {
+                            MemoryPressureListener.maybeNotifyMemoryPresure(
+                                    ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
+                        }
                     }
                 };
             }