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..768f374febb86c31a765d324c0e9dabdc2605de6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java
@@ -158,6 +158,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")

[Peter Wen, 2016/06/06 21:45:23]

You'll need to organize imports if you're using Eclipse, and add it yourself
otherwise.

[smaier, 2016/06/07 18:20:45]

Done.

     public static void configureStrictMode() {
         assert ThreadUtils.runningOnUiThread();
         if (sIsStrictModeAlreadyConfigured) {
@@ -172,7 +174,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 +194,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();
         }