[Android] Fix crashes on Chrome internal pages.

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
index 2c744fc86b10d88575ee17756b361e61a1133d72..d5e9c01a7e7ab90766bbc60f2bf71c6995e7851b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
@@ -223,7 +223,6 @@ public class CompositorViewHolder extends FrameLayout
             }
         });
 
-        if (!DeviceFormFactor.isTablet(getContext())) mProgressBarDrawingInfo = new DrawingInfo();
         mCompositorView = new CompositorView(getContext(), this);
         addView(mCompositorView,
                 new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
@@ -541,9 +540,14 @@ public class CompositorViewHolder extends FrameLayout
         TraceEvent.begin("CompositorViewHolder:layout");
         if (mLayoutManager != null) {
             mLayoutManager.onUpdate();
-            if (mProgressBarDrawingInfo != null) {
+
+            if (!DeviceFormFactor.isTablet(getContext()) && mControlContainer != null) {
+                if (mProgressBarDrawingInfo == null) mProgressBarDrawingInfo = new DrawingInfo();
                 mControlContainer.getProgressBarDrawingInfo(mProgressBarDrawingInfo);
+            } else {
+                assert mProgressBarDrawingInfo == null;
             }
+
             mCompositorView.finalizeLayers(mLayoutManager, mSkipNextToolbarTextureUpdate,
                     mProgressBarDrawingInfo);