Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
index 7c02f8eacb7a7fb62c31f4515f42cfa9199a399b..61f56cfa3754e8d5cb4b85ead1da47d8acac4918 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
@@ -74,7 +74,6 @@ import org.chromium.chrome.browser.omnibox.AutocompleteController; |
import org.chromium.chrome.browser.partnercustomizations.HomepageManager; |
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; |
import org.chromium.chrome.browser.preferences.ChromePreferenceManager; |
-import org.chromium.chrome.browser.preferences.ConnectionChangeReceiver; |
import org.chromium.chrome.browser.preferences.PrefServiceBridge; |
import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoScreen; |
import org.chromium.chrome.browser.signin.SigninPromoScreen; |
@@ -187,8 +186,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
private TabModelSelectorTabObserver mTabModelSelectorTabObserver; |
private TabModelObserver mTabModelObserver; |
- private ConnectionChangeReceiver mConnectionChangeReceiver; |
- |
private boolean mUIInitialized = false; |
private boolean mIsOnFirstRun = false; |
@@ -364,11 +361,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
if (getActivityTab() != null) getActivityTab().setIsAllowedToReturnToExternalApp(false); |
mTabModelSelectorImpl.saveState(); |
- try { |
- getConnectionChangeReceiver().unregisterReceiver(ChromeTabbedActivity.this); |
- } catch (IllegalArgumentException e) { |
- // This may happen when onStop get called very early in UI test. |
- } |
StartupMetrics.getInstance().recordHistogram(true); |
mActivityStopMetrics.onStopWithNative(this); |
} |
@@ -385,8 +377,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
// If we don't have a current tab, show the overview mode. |
if (getActivityTab() == null) mLayoutManager.showOverview(false); |
- getConnectionChangeReceiver().registerReceiver(ChromeTabbedActivity.this); |
- |
resetSavedInstanceState(); |
if (FeatureUtilities.isDocumentModeEligible(this)) { |
@@ -1354,13 +1344,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
|| super.onKeyDown(keyCode, event); |
} |
- private ConnectionChangeReceiver getConnectionChangeReceiver() { |
- if (mConnectionChangeReceiver == null) { |
- mConnectionChangeReceiver = new ConnectionChangeReceiver(); |
- } |
- return mConnectionChangeReceiver; |
- } |
- |
@VisibleForTesting |
public View getTabsView() { |
return getCompositorViewHolder(); |