Adding option for Proguard jar to be switched.

chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java
index 94fcafc5fcf141f2f656fac309d2cb3922c20eb5..1fae958f387f4f51941f71a095e1ec2d41b6147d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java
@@ -15,6 +15,7 @@ import org.chromium.base.BuildConfig;
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 
 import java.lang.reflect.Field;
@@ -158,6 +159,8 @@ public class ChromeStrictMode {
      * Turn on StrictMode detection based on build and command-line switches.
      */
     @UiThread
+    // FindBugs doesn't like conditionals with compile time results
+    @SuppressFBWarnings("UCF_USELESS_CONTROL_FLOW_NEXT_LINE")

[agrieve, 2016/06/08 18:47:32]

This is annoying :(. I think it's fine for now though. I do wonder if maybe
changing it to be a function that returns true/false would make findbugs okay
with it while still allowing proguard to eliminate it. Let's leave that for
another day.

     public static void configureStrictMode() {
         assert ThreadUtils.runningOnUiThread();
         if (sIsStrictModeAlreadyConfigured) {
@@ -172,7 +175,7 @@ public class ChromeStrictMode {
 
         CommandLine commandLine = CommandLine.getInstance();
         if ("eng".equals(Build.TYPE)
-                || BuildConfig.sIsDebug
+                || BuildConfig.IS_DEBUG
                 || ChromeVersionInfo.isLocalBuild()
                 || commandLine.hasSwitch(ChromeSwitches.STRICT_MODE)) {
             turnOnDetection(threadPolicy, vmPolicy);
@@ -192,7 +195,7 @@ public class ChromeStrictMode {
         // closely monitor this on dev channel.
         boolean enableStrictModeWatch =
                 (ChromeVersionInfo.isDevBuild() && Math.random() < UPLOAD_PROBABILITY);
-        if ((ChromeVersionInfo.isLocalBuild() && !BuildConfig.sIsDebug) || enableStrictModeWatch) {
+        if ((ChromeVersionInfo.isLocalBuild() && !BuildConfig.IS_DEBUG) || enableStrictModeWatch) {
             turnOnDetection(threadPolicy, vmPolicy);
             initializeStrictModeWatch();
         }