Revert of Remove unnecessary page loading in ContentShellActivity

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.ThreadUtils;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content.browser.ActivityContentVideoViewEmbedder;
 import org.chromium.content.browser.ContentVideoViewEmbedder;
 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.
  */
 @JNINamespace("content")
 public class ShellManager extends FrameLayout {
 
     public static final String DEFAULT_SHELL_URL = "http://www.google.com";
+    private static boolean sStartup = true;
     private WindowAndroid mWindow;
     private Shell mActiveShell;
 
     private String mStartupUrl = DEFAULT_SHELL_URL;
 
     // The target for all content rendering.
     private ContentViewRenderView mContentViewRenderView;
     private ContentViewClient mContentViewClient;
 
     /**
@@ skipping 19 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());
+        mContentViewRenderView = new ContentViewRenderView(getContext()) {
+            @Override
+            protected void onReadyToRender() {
+                if (sStartup) {
+                    if (initialLoadingNeeded) mActiveShell.loadUrl(mStartupUrl);
+                    sStartup = false;
+                }
+            }
+        };
         mContentViewRenderView.onNativeLibraryLoaded(window);
     }
 
     /**
      * @return The window used to generate all shells.
      */
     public WindowAndroid getWindow() {
         return mWindow;
     }
 
@@ skipping 82 matching lines @@
     public void destroy() {
         // Remove active shell (Currently single shell support only available).
         removeShell(mActiveShell);
         mContentViewRenderView.destroy();
         mContentViewRenderView = null;
     }
 
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }