Update to newer Android Lint and suppress new Lint errors

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.searchwidget;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ skipping 105 matching lines @@
     static final String PREF_SEARCH_ENGINE_SHORTNAME =
             "org.chromium.chrome.browser.searchwidget.SEARCH_ENGINE_SHORTNAME";
 
     /** Number of consecutive crashes this widget will absorb before giving up. */
     private static final int CRASH_LIMIT = 3;
 
     private static final String TAG = "searchwidget";
     private static final Object DELEGATE_LOCK = new Object();
     private static final Object OBSERVER_LOCK = new Object();
 
+    // TODO(crbug.com/635567): Fix this properly.
+    @SuppressLint("StaticFieldLeak")
     private static SearchWidgetTemplateUrlServiceObserver sObserver;
+    // TODO(crbug.com/635567): Fix this properly.
+    @SuppressLint("StaticFieldLeak")
     private static SearchWidgetProviderDelegate sDelegate;
 
     /**
      * Creates the singleton instance of the observer that will monitor for search engine changes.
      * The native library and the browser process must have been fully loaded before calling this.
      */
     public static void initialize() {
         ThreadUtils.assertOnUiThread();
         assert LibraryLoader.isInitialized();
 
@@ skipping 167 matching lines @@
 
         if (!shouldShowFullString()) engineName = null;
 
         if (!TextUtils.equals(getCachedEngineName(prefs), engineName)) {
             prefs.edit().putString(PREF_SEARCH_ENGINE_SHORTNAME, engineName).apply();
             performUpdate(null);
         }
     }
 
     /** Updates the number of consecutive crashes this widget has absorbed. */
-    @SuppressLint("CommitPrefEdits")
+    @SuppressLint({

[Ted C, 2017/04/27 19:02:47]

can this not all fit on a single line?

[F, 2017/04/28 18:25:15]

Done.

+            "CommitPrefEdits", "ApplySharedPref"
+    })
     static void updateNumConsecutiveCrashes(int newValue) {
         SharedPreferences prefs = getDelegate().getSharedPreferences();
         if (getNumConsecutiveCrashes(prefs) == newValue) return;
 
         SharedPreferences.Editor editor = prefs.edit();
         if (newValue == 0) {
             editor.remove(PREF_NUM_CONSECUTIVE_CRASHES);
         } else {
             editor.putInt(PREF_NUM_CONSECUTIVE_CRASHES, newValue);
         }
@@ skipping 52 matching lines @@
         return freIntent == null;
     }
 
     /** Sets an {@link SearchWidgetProviderDelegate} to interact with. */
     @VisibleForTesting
     static void setDelegateForTest(SearchWidgetProviderDelegate delegate) {
         assert sDelegate == null;
         sDelegate = delegate;
     }
 }