diff options
| author | boliu <boliu@chromium.org> | 2015-04-01 16:11:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-01 23:12:09 +0000 |
| commit | 139663213d8cc9dc1bad9c2d7d929cb454416288 (patch) | |
| tree | dacbe7dd0aa5814100a9168a8ead85311673bc8b | |
| parent | 87bac62e36ee67c35dec9d82973a56fb7606863e (diff) | |
| download | chromium_src-139663213d8cc9dc1bad9c2d7d929cb454416288.zip chromium_src-139663213d8cc9dc1bad9c2d7d929cb454416288.tar.gz chromium_src-139663213d8cc9dc1bad9c2d7d929cb454416288.tar.bz2 | |
Remove finalizers that only assert
Finalizers have a cost and exceptions in them do not cause a crash. So
finalizers that only assert are pretty much useless. Remove them.
BUG=472713
Review URL: https://codereview.chromium.org/1055633002
Cr-Commit-Position: refs/heads/master@{#323364}
7 files changed, 0 insertions, 43 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java index 20ea7aa..3bbf9b9d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java @@ -134,12 +134,6 @@ public class ForeignSessionHelper { mNativeForeignSessionHelper = 0; } - @Override - protected void finalize() { - // Just to make sure that we called destroy() before the java garbage collection picks up. - assert mNativeForeignSessionHelper == 0; - } - /** * @return {@code True} iff Tab sync is enabled. */ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LogoBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/LogoBridge.java index 6f31ec6c..becdeaa 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/LogoBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LogoBridge.java @@ -87,12 +87,6 @@ public class LogoBridge { nativeGetCurrentLogo(mNativeLogoBridge, logoObserver); } - @Override - protected void finalize() { - // Ensure that destroy() was called. - assert mNativeLogoBridge == 0; - } - @CalledByNative private static Logo createLogo(Bitmap image, String onClickUrl, String altText) { return new Logo(image, onClickUrl, altText); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java index 7802fe4..5ebd059 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java @@ -60,12 +60,6 @@ public class RecentlyClosedBridge { mNativeRecentlyClosedTabsBridge = nativeInit(profile); } - @Override - protected void finalize() { - // Ensure that destroy() was called. - assert mNativeRecentlyClosedTabsBridge == 0; - } - /** * Cleans up the C++ side of this class. This instance must not be used after calling destroy(). */ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java index f347ea2..c562ada 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java @@ -48,12 +48,6 @@ public class FaviconHelper { mNativeFaviconHelper = nativeInit(); } - @Override - protected void finalize() { - // Ensure that destroy() was called. - assert mNativeFaviconHelper == 0; - } - /** * Clean up the C++ side of this class. After the call, this class instance shouldn't be used. */ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java b/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java index d07d7ea..fa5e88d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java @@ -62,12 +62,6 @@ public class MostVisitedSites { mNativeMostVisitedSites = 0; } - @Override - protected void finalize() { - // Ensure that destroy() was called. - assert mNativeMostVisitedSites == 0; - } - /** * Sets the MostVisitedURLsObserver to receive the list of most visited sites now or soon, and * after any changes to the list. Note: the observer may be notified synchronously or diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserver.java index d445452..4643915 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserver.java @@ -102,11 +102,4 @@ public class TabModelSelectorTabObserver extends EmptyTabObserver { } } } - - @Override - protected void finalize() throws Throwable { - super.finalize(); - - assert mIsDestroyed; - } } diff --git a/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java b/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java index b29a4db..48cbd5e 100644 --- a/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java +++ b/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java @@ -239,12 +239,6 @@ public class TracingControllerAndroid { } } - @Override - protected void finalize() { - // Ensure that destroy() was called. - assert mNativeTracingControllerAndroid == 0; - } - /** * Clean up the C++ side of this class. * After the call, this class instance shouldn't be used. |
