Use LeakCanary for all Android Service instances

chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

 // Copyright 2014 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.init;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
-import com.squareup.leakcanary.LeakCanary;
-
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContentUriUtils;
+import org.chromium.base.LeakCanaryUtil;
 import org.chromium.base.Log;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
-import org.chromium.base.annotations.RemovableInRelease;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ChromeStrictMode;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.FileProviderHelper;
 import org.chromium.chrome.browser.crash.MinidumpDirectoryObserver;
 import org.chromium.chrome.browser.device.DeviceClassManager;
@@ skipping 50 matching lines @@
     public static ChromeBrowserInitializer getInstance(Context context) {
         if (sChromeBrowserInitiliazer == null) {
             sChromeBrowserInitiliazer = new ChromeBrowserInitializer(context);
         }
         return sChromeBrowserInitiliazer;
     }
 
     private ChromeBrowserInitializer(Context context) {
         mApplication = (ChromeApplication) context.getApplicationContext();
         mHandler = new Handler(Looper.getMainLooper());
-        initLeakCanary();
-    }
-
-    @RemovableInRelease
-    private void initLeakCanary() {
-        // Watch that Activity objects are not retained after their onDestroy() has been called.
-        // This is a no-op in release builds.
-        LeakCanary.install(mApplication);
+        LeakCanaryUtil.initialize(mApplication);
     }
 
     /**
      * Initializes the Chrome browser process synchronously.
      *
      * @throws ProcessInitException if there is a problem with the native library.
      */
     public void handleSynchronousStartup() throws ProcessInitException {
         assert ThreadUtils.runningOnUiThread() : "Tried to start the browser on the wrong thread";
 
@@ skipping 287 matching lines @@
                     // stale natively-loaded resources are not reloaded (http://crbug.com/552618).
                     if (!mInitialLocale.equals(Locale.getDefault())) {
                         Log.e(TAG, "Killing process because of locale change.");
                         Process.killProcess(Process.myPid());
                     }
                 }
             }
         };
     }
 }