Adding zmo to see if he has any suggestions as to what is up on Android.

Actually, pretty sure this is
https://codereview.chromium.org/1930443003/

And, that doesn't revert cleanly.

wnwen, could you help take a look at this? I've created a manual revert at
https://codereview.chromium.org/1934623002

Should be fixed in https://codereview.chromium.org/1936093002/. When I run the webgl conformance tests locally with the same command I get this error, and I couldn't find the gpu trybot to run to confirm my fix. :-/

Traceback (most recent call last):
  RunBenchmark at /Work/clankium/src/third_party/catapult/telemetry/telemetry/internal/story_runner.py:312
    benchmark.ShouldTearDownStateAfterEachStoryRun())
  Run at /Work/clankium/src/third_party/catapult/telemetry/telemetry/internal/story_runner.py:221
    test, finder_options.Copy(), story_set)
  __init__ at /Work/clankium/src/third_party/catapult/telemetry/telemetry/page/shared_page_state.py:71
    _PrepareFinderOptions(finder_options, self._test, device_type)
  _PrepareFinderOptions at /Work/clankium/src/third_party/catapult/telemetry/telemetry/page/shared_page_state.py:31
    test.CustomizeBrowserOptions(finder_options.browser_options)
  CustomizeBrowserOptions at /Work/clankium/src/content/test/gpu/gpu_tests/webgl_conformance.py:101
    if (browser.target_os.startswith('android') and
AttributeError: 'NoneType' object has no attribute 'target_os'

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b5eb895b2108145dfe9a0096b3977ffca0807b74

commit b5eb895b2108145dfe9a0096b3977ffca0807b74
Author: wnwen <wnwen@chromium.org>
Date: Mon May 02 17:09:28 2016

Reland 2 of Unify application context usage.

Reland 1: https://codereview.chromium.org/1930443003/

Includes minor fixes:
- Fix webgl conformance tests.

TBR=torne@chromium.org,davidben@chromium.org,yfriedman@chromium.org,nyquist@chromium.org,caitkp@chromium.org,sergeyu@chromium.org,amistry@chromium.org

BUG= 552419 , 606824 , 607811 

Review-Url: https://codereview.chromium.org/1930443003
Cr-Commit-Position: refs/heads/master@{#390367}

Review-Url: https://codereview.chromium.org/1936093002
Cr-Commit-Position: refs/heads/master@{#390973}

[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/base/android/context_utils.cc
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/base/android/context_utils.h
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/base/android/java/src/org/chromium/base/ContextUtils.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/components/resource_provider/android/android_hooks.cc
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/components/resource_provider/android/java/org/chromium/resource_provider/Main.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/components/web_restrictions/browser/junit/src/org/chromium/components/webrestrictions/WebRestrictionsClientTest.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/remoting/android/host/src/org/chromium/chromoting/host/jni/Host.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java
[modify] https://crrev.com/b5eb895b2108145dfe9a0096b3977ffca0807b74/testing/android/native_test/native_test_launcher.cc

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/clank/internal/apps/+/c3731713c94debffc9078619b5826d56baba0460

commit c3731713c94debffc9078619b5826d56baba0460
Author: wnwen <wnwen@chromium.org>
Date: Mon May 02 17:09:28 2016

Seems to have done it.