Fix ContentVideoView to support a ContextWrapper.

content/public/android/java/src/org/chromium/content/browser/ContentVideoView.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.browser;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.content.DialogInterface;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ skipping 350 matching lines @@
     public boolean isPlaying() {
         return mNativeContentVideoView != 0 && nativeIsPlaying(mNativeContentVideoView);
     }
 
     @CalledByNative
     private static ContentVideoView createContentVideoView(
             Context context, long nativeContentVideoView, ContentVideoViewClient client,
             boolean legacy) {
         ThreadUtils.assertOnUiThread();
         // The context needs be Activity to create the ContentVideoView correctly.
-        if (!(context instanceof Activity)) {
-            Log.w(TAG, "Wrong type of context, can't create fullscreen video");
+        if (!isActivityContext(context)) {
+            Log.e(TAG, "Wrong type of context, can't create fullscreen video");
             return null;
         }
         ContentVideoView videoView = null;
         if (legacy) {
             videoView = new ContentVideoViewLegacy(context, nativeContentVideoView, client);
         } else {
             videoView = new ContentVideoView(context, nativeContentVideoView, client);
         }
 
         if (videoView.getContentVideoViewClient().onShowCustomView(videoView)) {
             return videoView;
         }
         return null;
     }
 
+    private static boolean isActivityContext(Context context) {
+        // Only retrieve the base context if the supplied context is a ContextWrapper but not
+        // an Activity, given that Activity is already a subclass of ContextWrapper.
+        if (context instanceof ContextWrapper && !(context instanceof Activity)) {
+            context = ((ContextWrapper) context).getBaseContext();
+        }
+        return context instanceof Activity;
+    }
+
     public void removeSurfaceView() {
         removeView(mVideoSurfaceView);
         removeView(mProgressView);
         mVideoSurfaceView = null;
         mProgressView = null;
     }
 
     public void exitFullscreen(boolean relaseMediaPlayer) {
         destroyContentVideoView(false);
         if (mNativeContentVideoView != 0) {
@@ skipping 67 matching lines @@
     private native int nativeGetDurationInMilliSeconds(long nativeContentVideoView);
     private native void nativeRequestMediaMetadata(long nativeContentVideoView);
     private native int nativeGetVideoWidth(long nativeContentVideoView);
     private native int nativeGetVideoHeight(long nativeContentVideoView);
     private native boolean nativeIsPlaying(long nativeContentVideoView);
     private native void nativePause(long nativeContentVideoView);
     private native void nativePlay(long nativeContentVideoView);
     private native void nativeSeekTo(long nativeContentVideoView, int msec);
     private native void nativeSetSurface(long nativeContentVideoView, Surface surface);
 }