Make content_browsertests for Chrome on Android running with valid Views

content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content_shell;
 
 import android.app.Activity;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 
 import org.chromium.base.CalledByNative;
+import org.chromium.base.CommandLine;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.content.browser.ActivityContentVideoViewClient;
 import org.chromium.content.browser.ContentVideoViewClient;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container and generator of ShellViews.
  */
@@ skipping 34 matching lines @@
                     }
                 };
             }
         };
     }
 
     /**
      * @param window The window used to generate all shells.
      */
     public void setWindow(WindowAndroid window) {
+        setWindow(window, true);
+    }
+
+    /**
+     * @param window The window used to generate all shells.
+     * @param initialLoadingNeeded Whether initial loading is needed or not.
+     */
+    @VisibleForTesting
+    public void setWindow(WindowAndroid window, final boolean initialLoadingNeeded) {
         assert window != null;
         mWindow = window;
         mContentViewRenderView = new ContentViewRenderView(getContext()) {
             @Override
             protected void onReadyToRender() {
                 if (sStartup) {
-                    mActiveShell.loadUrl(mStartupUrl);
+                    if (initialLoadingNeeded) mActiveShell.loadUrl(mStartupUrl);
                     sStartup = false;
                 }
             }
 
             @Override
             protected void onWindowVisibilityChanged(int visibility) {
                 if (visibility == View.GONE && mActiveShell != null) {
                     ContentViewCore contentViewCore = mActiveShell.getContentViewCore();
                     if (contentViewCore != null) contentViewCore.onHide();
                 }
@@ skipping 62 matching lines @@
 
         // TODO(tedchoc): Allow switching back to these inactive shells.
         if (mActiveShell != null) removeShell(mActiveShell);
 
         showShell(shellView);
         return shellView;
     }
 
     private void showShell(Shell shellView) {
         shellView.setContentViewRenderView(mContentViewRenderView);
-        addView(shellView, new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+        // If GPU hardware acceleration is disabled, composition shouldn't happen.
+        if (!CommandLine.getInstance().hasSwitch("disable-gpu")) {

[Jaekyun Seok (inactive), 2015/02/23 10:41:34]

I found that ChildDiscardableSharedMemoryManagerBrowserTest.* and
ScreenOrientationBrowserTest.* crashed after applying patchset #21.
And a "disable-gpu" switch was set for both tests.
I'm not sure whether disabling composition is a proper solution or not, but I
confirmed that it worked well for those tests.
At least, it will not cause any regression because composition doesn't happen
anyway at all without this CL.

[no sievers, 2015/02/24 02:02:32]

--disable-gpu is not supported on Android.

Let's figure out if the crashing tests are relevant on Android (they probably
are), and then either fix or disable them.

[Jaekyun Seok (inactive), 2015/02/24 12:49:50]

Then I will disable those tests as a workaround, and after this CL is landed I
will try to fix them.

+            addView(shellView, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT));
+        }
         mActiveShell = shellView;
         ContentViewCore contentViewCore = mActiveShell.getContentViewCore();
         if (contentViewCore != null) {
             mContentViewRenderView.setCurrentContentViewCore(contentViewCore);
             contentViewCore.onShow();
         }
     }
 
     @CalledByNative
     private void removeShell(Shell shellView) {
         if (shellView == mActiveShell) mActiveShell = null;
         if (shellView.getParent() == null) return;
         ContentViewCore contentViewCore = shellView.getContentViewCore();
         if (contentViewCore != null) contentViewCore.onHide();
         shellView.setContentViewRenderView(null);
         removeView(shellView);
     }
 
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }