Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

Issue 1697603002: Use LeakCanary for all Android Service instances Base URL: https://chromium.googlesource.com/chromium/src.git@leak-canary-3
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
index 91f0dee1b279ff923c2a9f3f8009bd8f155767f1..054ccf6eedb71542a86e465e66fd39109eeff33a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
@@ -13,19 +13,17 @@ 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;
@@ -96,14 +94,7 @@ public class ChromeBrowserInitializer {
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);
}
/**

Powered by Google App Engine
This is Rietveld 408576698