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

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.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_apk;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.View;
 import android.widget.Toast;
 
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.CommandLine;
 import org.chromium.base.MemoryPressureListener;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.ProcessInitException;
-import org.chromium.content.browser.ActivityContentVideoViewClient;
 import org.chromium.content.browser.BrowserStartupController;
-import org.chromium.content.browser.ContentVideoViewClient;
 import org.chromium.content.browser.ContentView;
-import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.DeviceUtils;
 import org.chromium.content.common.ContentSwitches;
 import org.chromium.content_shell.Shell;
 import org.chromium.content_shell.ShellManager;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Activity for managing the Content Shell.
  */
@@ skipping 73 matching lines @@
         }
     }
 
     private void finishInitialization(Bundle savedInstanceState) {
         String shellUrl = ShellManager.DEFAULT_SHELL_URL;
         if (savedInstanceState != null
                 && savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {
             shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY);
         }
         mShellManager.launchShell(shellUrl);
-        getActiveContentView().setContentViewClient(new ContentViewClient() {
-            @Override
-            public ContentVideoViewClient getContentVideoViewClient() {
-                return new ActivityContentVideoViewClient(ContentShellActivity.this) {
-                    @Override
-                    public void onShowCustomView(View view) {
-                        super.onShowCustomView(view);
-                        if (CommandLine.getInstance().hasSwitch(
-                                ContentSwitches.ENABLE_OVERLAY_FULLSCREEN_VIDEO_SUBTITLE)) {
-                            mShellManager.setOverlayVideoMode(true);
-                        }
-                    }
-
-                    @Override
-                    public void onDestroyContentVideoView() {
-                        super.onDestroyContentVideoView();
-                        if (CommandLine.getInstance().hasSwitch(
-                                ContentSwitches.ENABLE_OVERLAY_FULLSCREEN_VIDEO_SUBTITLE)) {
-                          mShellManager.setOverlayVideoMode(false);
-                        }
-                    }
-                };
-            }
-        });
     }
 
     private void initializationFailed() {
         Log.e(TAG, "ContentView initialization failed.");
         Toast.makeText(ContentShellActivity.this,
                 R.string.browser_process_initialization_failed,
                 Toast.LENGTH_SHORT).show();
         finish();
     }
 
@@ skipping 93 matching lines @@
 
     /**
      * @return The {@link ContentView} owned by the currently visible {@link Shell} or null if one
      *         is not showing.
      */
     public ContentView getActiveContentView() {
         Shell shell = getActiveShell();
         return shell != null ? shell.getContentView() : null;
     }
 }