android: Handle getViewSurface() failure gracefully.

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
index ee4d63a08a5dbfba1a514c1a688211cd241e7c7c..146129b3df4d97fec4caf63fdee1fb2f02e43367 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
@@ -41,7 +41,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @JNINamespace("content")
 public class ChildProcessLauncher {
-    private static final String TAG = "cr.ChildProcessLaunch";
+    private static final String TAG = "cr.ChildProcLauncher";

[no sievers, 2015/11/11 01:02:30]

presubmit warning for length :/

 
     static final int CALLBACK_FOR_UNKNOWN_PROCESS = 0;
     static final int CALLBACK_FOR_GPU_PROCESS = 1;
@@ -722,7 +722,10 @@ public class ChildProcessLauncher {
                     Log.e(TAG, "Invalid surfaceId.");
                     return null;
                 }
-                assert surface.isValid();
+                if (!surface.isValid()) {
+                    Log.e(TAG, "Requested surface is not valid.");
+                    return null;
+                }
                 return new SurfaceWrapper(surface);
             }