Moving all for test keeps into for test flags file.

chrome/android/java/proguard.flags

Index: chrome/android/java/proguard.flags
diff --git a/chrome/android/java/proguard.flags b/chrome/android/java/proguard.flags
index 627ae0d1674e93830d93ece6921628613fedac48..da88cecbda146ae001bac2fa8a3f6c6b46e71c42 100644
--- a/chrome/android/java/proguard.flags
+++ b/chrome/android/java/proguard.flags
@@ -20,9 +20,8 @@
 -keep public class com.google.android.apps.chrome** extends android.app.Fragment
 -keep public class org.chromium** extends android.app.Fragment
 
-# Keeps for class level annotations.
+# Keep for class level annotations.
 -keep @**.UsedByReflection class *
--keep @**.VisibleForTesting class *
 
 # Keeps for method level annotations.
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
@@ -44,9 +43,6 @@
   @**.UsedByReflection <methods>;
 }
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.VisibleForTesting <methods>;
-}
--keepclasseswithmembers class com.google.android.apps.chrome.** {
   native <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
@@ -68,9 +64,6 @@
   @**.UsedByReflection <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
-  @**.VisibleForTesting <methods>;
-}
--keepclasseswithmembers class org.chromium.** {
   native <methods>;
 }
 
@@ -88,11 +81,6 @@
   @org.chromium.base.annotations.RemovableInRelease <methods>;
 }
 
-# TODO(aurimas): figure out why we need to keep these classes.
--keep class org.chromium.base.test.** {
-  *;
-}
-
 # Keep protobuf code used via reflection
 # TODO(tonyg): Removing these -keeps results in new notes, but nothing seems to
 # break. This exclusion costs almost 100k of dex size so consider replacing it
@@ -156,77 +144,4 @@
   static *** isLoggable(...);
 }
 
-# Everything below this is kept because they are referenced by the test APK.
--keep class android.support.v7.mediarouter.R* {
-  *;
-}
-
--keep class android.support.v7.media.MediaRouteProvider** {
-  *;
-}
-
--keep class android.support.v4.app.FragmentManager** {
-  *;
-}
-
--keep class android.support.v4.app.DialogFragment** {
-  *;
-}
-
--keep class android.support.v7.app.NotificationCompat** {
-  *;
-}
-
--keep class android.support.v7.app.AlertDialog** {
-  *;
-}
 
--keep class com.google.android.gms.cast.CastMediaControlIntent* {
-  *;
-}
-
--keepnames class com.google.android.gms.gcm.** {
-  *;
-}
-
--keepclassmembers class com.google.android.gms.gcm.TaskParams {
-  public <init>(java.lang.String);
-}
-
--keepnames class jp.tomorrowkey.android.gifplayer.** {
-  public *;
-}
-
-# Used in tests.
--keep class android.support.v4.view.ViewCompat {
-  public static int getLayoutDirection(android.view.View);
-}
-
-# flingViewport is used by Android WebView and a Chrome test.
--keepclassmembers class org.chromium.content.browser.ContentViewCore {
-  public void flingViewport(long, int, int);
-}
-
-# Needed to compile ChromeTest.apk
--keep class android.support.customtabs.** {
-  *;
-}
-
-# TODO(yfriedman): Remove when crbug.com/488192 is fixed.
--dontwarn org.apache.http.conn.scheme.LayeredSocketFactory
-
-# Needed to run ChromeTest.apk
--keepnames class com.google.android.gms.common.GoogleApiAvailability {
-  *;
-}
-
-# Needed for chrome_sync_shell_test_apk. Note - these do no affect chrome_apk's
-# size.
--keep class org.chromium.sync.protocol.* { *; }

[Yaron, 2016/07/08 21:29:27]

wonder if this will be still be needed. probably not but trybots will tell you.

[smaier, 2016/07/11 14:54:25]

As of ~3 weeks ago, it was needed. Is there anything that has changed with
chrome_sync_shell_test_apk since then?
https://codereview.chromium.org/2079613002/#ps80001

-
-# These resources are referenced in tests, but not in the real application.
--keepclassmembers class org.chromium.chrome.R$id {
-  int webapp_splash_space;
-  int mr_chooser_list;
-  int find_toolbar;
-}