| Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
|
| index 1d9ad99a34ed3f0efa772f02cbbe601f1efc7bbe..6f653a4892f17c7a1b478aaa07512263f85ae89e 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
|
| @@ -311,26 +311,19 @@ public class ChromeApplication extends ContentApplication {
|
| IntentHandler.clearPendingReferrer();
|
| IntentHandler.clearPendingIncognitoUrl();
|
|
|
| - if (FeatureUtilities.isDocumentMode(this)) {
|
| - if (sDocumentTabModelSelector != null) {
|
| - RecordHistogram.recordCountHistogram("Tab.TotalTabCount.BeforeLeavingApp",
|
| - sDocumentTabModelSelector.getTotalTabCount());
|
| - }
|
| - } else {
|
| - int totalTabCount = 0;
|
| - for (WeakReference<Activity> reference : ApplicationStatus.getRunningActivities()) {
|
| - Activity activity = reference.get();
|
| - if (activity instanceof ChromeActivity) {
|
| - TabModelSelector tabModelSelector =
|
| - ((ChromeActivity) activity).getTabModelSelector();
|
| - if (tabModelSelector != null) {
|
| - totalTabCount += tabModelSelector.getTotalTabCount();
|
| - }
|
| + int totalTabCount = 0;
|
| + for (WeakReference<Activity> reference : ApplicationStatus.getRunningActivities()) {
|
| + Activity activity = reference.get();
|
| + if (activity instanceof ChromeActivity) {
|
| + TabModelSelector tabModelSelector =
|
| + ((ChromeActivity) activity).getTabModelSelector();
|
| + if (tabModelSelector != null) {
|
| + totalTabCount += tabModelSelector.getTotalTabCount();
|
| }
|
| }
|
| - RecordHistogram.recordCountHistogram(
|
| - "Tab.TotalTabCount.BeforeLeavingApp", totalTabCount);
|
| }
|
| + RecordHistogram.recordCountHistogram(
|
| + "Tab.TotalTabCount.BeforeLeavingApp", totalTabCount);
|
| }
|
|
|
| /**
|
| @@ -812,14 +805,6 @@ public class ChromeApplication extends ContentApplication {
|
| }
|
|
|
| /**
|
| - * @return Whether or not the Singleton has been initialized.
|
| - */
|
| - @VisibleForTesting
|
| - public static boolean isDocumentTabModelSelectorInitializedForTests() {
|
| - return sDocumentTabModelSelector != null;
|
| - }
|
| -
|
| - /**
|
| * @return An instance of RevenueStats to be installed as a singleton.
|
| */
|
| public RevenueStats createRevenueStatsInstance() {
|
|
|