Revert "[Android] Fix a flicker in stopping Chrome"

This reverts commit e4b1990c9d49fd9734940fa863513ad43b82c6e7.

BUG=434401

Review URL: https://codereview.chromium.org/969533003

Cr-Commit-Position: refs/branch-heads/2311@{#131}
Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}

6 files changed, 18 insertions, 17 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index f1dc06bb..a07fdaf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -1101,6 +1101,13 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     }
 
     /**
+     * Called on the foreground tab when the Activity is stopped.
+     */
+    public void onActivityStop() {
+        hide();
+    }
+
+    /**
      * Prepares the tab to be shown. This method is supposed to be called before the tab is
      * displayed. It restores the ContentView if it is not available after the cold start and
      * reloads the tab if its renderer has crashed.
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index 1eb022a..776303f 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
@@ -278,6 +278,9 @@ public class ChromeShellActivity extends ActionBarActivity implements AppMenuPro
         super.onStop();
 
         if (mToolbar != null) mToolbar.hideSuggestions();
+
+        Tab activeTab = getActiveTab();
+        if (activeTab != null) activeTab.onActivityStop();
     }
 
     @Override
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
index a5a1c09..54afde0 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
@@ -94,12 +94,6 @@ public class TabManager extends LinearLayout {
             protected void onReadyToRender() {
                 if (mCurrentTab == null) createTab(mStartupUrl, TabLaunchType.FROM_RESTORE);
             }
-
-            @Override
-            protected void onWindowVisibilityChanged(int visibility) {
-                if (visibility == View.GONE && mCurrentTab != null) mCurrentTab.hide();
-                super.onWindowVisibilityChanged(visibility);
-            }
         };
         mContentViewRenderView.onNativeLibraryLoaded(window);
         mContentViewHolder.addView(mContentViewRenderView,
diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
index d6cb714..9e647ee 100644
--- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
@@ -213,7 +213,6 @@ import org.chromium.content_public.browser.WebContents;
     /**
      * Hide transition elements.
      */
-    @Override
     public void hideTransitionElements(String cssSelector) {
         nativeHideTransitionElements(mNativeWebContentsAndroid, cssSelector);
     }
@@ -221,7 +220,6 @@ import org.chromium.content_public.browser.WebContents;
     /**
      * Show transition elements.
      */
-    @Override
     public void showTransitionElements(String cssSelector) {
         nativeShowTransitionElements(mNativeWebContentsAndroid, cssSelector);
     }
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
index bb9a5d6..7ddabf0 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
@@ -78,15 +78,6 @@ public class ShellManager extends FrameLayout {
                     sStartup = false;
                 }
             }
-
-            @Override
-            protected void onWindowVisibilityChanged(int visibility) {
-                if (visibility == View.GONE && mActiveShell != null) {
-                    ContentViewCore contentViewCore = mActiveShell.getContentViewCore();
-                    if (contentViewCore != null) contentViewCore.onHide();
-                }
-                super.onWindowVisibilityChanged(visibility);
-            }
         };
         mContentViewRenderView.onNativeLibraryLoaded(window);
     }
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index 7d31a26..bc460bf 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
@@ -183,6 +183,14 @@ public class ContentShellActivity extends Activity {
     }
 
     @Override
+    protected void onStop() {
+        super.onStop();
+
+        ContentViewCore contentViewCore = getActiveContentViewCore();
+        if (contentViewCore != null) contentViewCore.onHide();
+    }
+
+    @Override
     protected void onStart() {
         super.onStart();