commit ac95ff766dc80d25310a9f8f0adf34fed09ca900
author Primiano Tucci <primiano@google.com> Tue Oct 08 11:03:13 2013 +0100
committer Primiano Tucci <primiano@google.com> Tue Oct 08 11:04:59 2013 +0100
tree 7a1faf666e404ac0f96d2f401c147040f543289a
parent 9017f9d3e01d2789bb5c79188ee97263c01eac93

Unlock the automerger: remove simulateMemoryPressureSignal.

The semantic of simulateMemoryPressureSignal is changed and a fix
upstream is required. Commenting out the code for the moment to
unlock the automerger.

Change-Id: I5c06ec53e164d8162d03e861206f043cce829981

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 9c4fd80..abc75f7 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -210,10 +210,11 @@
 
                     @Override
                     public void freeMemoryForTests() {
-                        if (ActivityManager.isRunningInTestHarness()) {
-                            MemoryPressureListener.simulateMemoryPressureSignal(
-                                    ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-                        }
+                        // TODO(primiano): temporarily commented out to unlock the automerger.
+                        // if (ActivityManager.isRunningInTestHarness()) {
+                        //     MemoryPressureListener.simulateMemoryPressureSignal(
+                        //             ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
+                        // }
                     }
                 };
             }