Revert of Proguard warning suppresions removed

chrome/android/java/proguard.flags

 # Keep line number information, useful for stack traces.
 -keepattributes SourceFile,LineNumberTable
 
 # Keep the annotations.
 -keep @interface ***
 
 # Disable obfuscation for the following two packages.
 -keepnames class com.google.android.apps.chrome.**,org.chromium.** {
   *;
 }
@@ skipping 66 matching lines @@
 
 # SearchView is used in website_preferences_menu.xml and is constructed by
 # Android using reflection.
 -keep class android.support.v7.widget.SearchView {
   public <init>(...);
 }
 
 # Google Play Services warnings are about its resources.
 -dontwarn com.google.android.gms.R**
 
+# TODO(yfriedman): Remove when crbug.com/488192 is fixed.
+-dontwarn org.apache.http.**
+
 # The support library contains references to newer platform versions.
 # Don't warn about those in case this app is linking against an older
 # platform version.  We know about them, and they are safe.
 -dontwarn android.support.**
 
 # Proguard mistakenly optimizes away some null checks on final fields
 # in the support library.
 # See https://sourceforge.net/p/proguard/bugs/531/#fdc9/41e2
 -keepclassmembers,allowshrinking,allowobfuscation class android.support.v7.widget.AppCompatButton {
   !static final <fields>;
 }
 
 # Everything below this is kept because they are referenced by the test APK.
+-dontwarn javax.annotation.Nullable
+
 -keep class android.support.v7.mediarouter.R* {
   *;
 }
 
 -keep class android.support.v7.media.MediaRouteProvider** {
   *;
 }
 
 -keep class android.support.v4.app.FragmentManager** {
   *;
@@ skipping 30 matching lines @@
 # 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);
 }
 
+# TODO(aurimas): remove this when Google Play Services no longer uses setLatestEventInfo call
+# that was deprecated in Android M. It is save to suppress this according to b/18510449.
+-dontwarn android.app.Notification
+
+# IntentUtils uses reflection to access a method that is hidden until API level 18.
+-dontnote org.chromium.chrome.browser.util.IntentUtils
+
 # 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 {
   *;
 }
+
+#-keep public class android.net.http.SslCertificate
+#-keep public class android.webkit.WebVie
+
+#-dontwarn android.webkit.WebView
+-dontwarn android.net.http.SslCertificate