Fix a crash of the Content Shell for Android when showing videos in a ContentVideoView.

content/shell/android/java/src/org/chromium/content_shell/Shell.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.content.Context;
 import android.graphics.drawable.ClipDrawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container for the various UI components that make up a shell window.
  */
 @JNINamespace("content")
 public class Shell extends LinearLayout {
 
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
     private final Runnable mClearProgressRunnable = new Runnable() {
         @Override
         public void run() {
             mProgressDrawable.setLevel(0);
         }
     };
 
     // TODO(jrg): a mContentView.destroy() call is needed, both upstream and downstream.
     private ContentView mContentView;
+    private ContentViewClient mContentViewClient;
     private EditText mUrlTextView;
     private ImageButton mPrevButton;
     private ImageButton mNextButton;
 
     private ClipDrawable mProgressDrawable;
 
     private long mNativeShell;
     private ContentViewRenderView mContentViewRenderView;
     private WindowAndroid mWindow;
 
@@ skipping 18 matching lines @@
         } else {
             contentViewHolder.addView(contentViewRenderView,
                     new FrameLayout.LayoutParams(
                             FrameLayout.LayoutParams.MATCH_PARENT,
                             FrameLayout.LayoutParams.MATCH_PARENT));
         }
         mContentViewRenderView = contentViewRenderView;
     }
 
     /**
+     * @param client The {@link ContentViewClient} to be bound to any current or new
+     *               {@link ContentViewCore}s associated with this {@link Shell}.
+     */
+    public void setContentViewClient(ContentViewClient client) {

[Ted C, 2014/02/20 00:54:08]

with my comment in ShellManager, you should be able to delete this method and
just add ContentViewClient as a param to initialize.

Then you don't need to worry about clearing references or anything like that.

+        if (mContentViewClient == client) return;
+
+        ContentViewClient oldClient = mContentViewClient;
+        mContentViewClient = client;
+
+        if (mContentView == null) return;
+
+        if (mContentViewClient != null) {
+            mContentView.setContentViewClient(mContentViewClient);
+        } else if (oldClient != null) {
+            // We can't set a null client, but we should clear references to the last one.
+            mContentView.setContentViewClient(new ContentViewClient());
+        }
+    }
+
+    /**
      * Initializes the Shell for use.
      *
      * @param nativeShell The pointer to the native Shell object.
      * @param window The owning window for this shell.
      */
     public void initialize(long nativeShell, WindowAndroid window) {
         mNativeShell = nativeShell;
         mWindow = window;
     }
 
@@ skipping 145 matching lines @@
     }
 
     /**
      * Initializes the ContentView based on the native tab contents pointer passed in.
      * @param nativeTabContents The pointer to the native tab contents object.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private void initFromNativeTabContents(long nativeTabContents) {
         mContentView = ContentView.newInstance(getContext(), nativeTabContents, mWindow);
+        if (mContentViewClient != null) mContentView.setContentViewClient(mContentViewClient);

[Ted C, 2014/02/20 00:54:08]

we will know that mContentViewClient isn't null, so you can just set it without
this check.

         if (mContentView.getUrl() != null) mUrlTextView.setText(mContentView.getUrl());
         ((FrameLayout) findViewById(R.id.contentview_holder)).addView(mContentView,
                 new FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT));
         mContentView.requestFocus();
         mContentViewRenderView.setCurrentContentView(mContentView);
     }
 
     /**
      * @return The {@link ContentView} currently shown by this Shell.
      */
     public ContentView getContentView() {
         return mContentView;
     }
 
     private void setKeyboardVisibilityForUrl(boolean visible) {
         InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
                 Context.INPUT_METHOD_SERVICE);
         if (visible) {
             imm.showSoftInput(mUrlTextView, InputMethodManager.SHOW_IMPLICIT);
         } else {
             imm.hideSoftInputFromWindow(mUrlTextView.getWindowToken(), 0);
         }
     }
 
     private static native void nativeCloseShell(long shellPtr);
 }