[Android] Fix crashes on Chrome internal pages.
commit1bde929fcf8b4ec353b3b9818256910f6dcad426
authorkkimlabs <kkimlabs@chromium.org>
Thu, 30 Jul 2015 21:37:30 +0000 (30 14:37 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 30 Jul 2015 21:38:11 +0000 (30 21:38 +0000)
treeef14301927a1b5c3a47968bdcb908ce5191dfecb
parent602f4b3a89954526cab86254f577d6ac13454dfc
[Android] Fix crashes on Chrome internal pages.

CompositorViewHolder#mControlContainer can be null on viewing internal
pages, so check it before using it.

Also fixed progress bar API calling order in
LoadProgressSimulator.

BUG=514955

Review URL: https://codereview.chromium.org/1264813002

Cr-Commit-Position: refs/heads/master@{#341198}
chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java