Miscellaneous fixes to DataUse UI

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 7f514c79c1eecadd170388bf39210410e0bc4053..4661f592510419ab06423748a10e3c29ddd3c481 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -472,18 +472,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         if (mTabModelSelectorTabObserver != null) mTabModelSelectorTabObserver.destroy();
         mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(tabModelSelector) {
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
-                if (DataUseTabUIManager.checkDataUseTrackingStarted(tab)) {
+            public void didFirstVisuallyNonEmptyPaint(Tab tab) {
+                if (DataUseTabUIManager.checkAndResetDataUseTrackingStarted(tab)) {
                     mDataUseSnackbarController.showDataUseTrackingStartedBar();
-                } else if (DataUseTabUIManager.checkDataUseTrackingEnded(tab)
-                        && DataUseTabUIManager
-                                .getOptedOutOfDataUseDialog(getApplicationContext())) {
+                } else if (DataUseTabUIManager.getOptedOutOfDataUseDialog(getApplicationContext())
+                        && DataUseTabUIManager.checkAndResetDataUseTrackingEnded(tab)) {
                     mDataUseSnackbarController.showDataUseTrackingEndedBar();
                 }
-            }
 
-            @Override
-            public void didFirstVisuallyNonEmptyPaint(Tab tab) {
                 if (!tab.isNativePage() && !tab.isIncognito()
                         && DataReductionProxySettings.getInstance().wasLoFiModeActiveOnMainFrame()
                         && DataReductionProxySettings.getInstance().canUseDataReductionProxy(