| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 8f07010f912ca8c1f782a9e1468dc11052619c2f..605bb9b3c5798a96185c217667a981c72af94eb3 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -1539,7 +1539,8 @@ gfx::Rect RenderWidgetHostViewAndroid::GetBoundsInRootWindow() {
|
| gfx::GLSurfaceHandle RenderWidgetHostViewAndroid::GetCompositingSurface() {
|
| gfx::GLSurfaceHandle handle =
|
| gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NULL_TRANSPORT);
|
| - if (using_browser_compositor_) {
|
| + // Null check for when we're running inside content_unittests.
|
| + if (using_browser_compositor_ && BrowserGpuChannelHostFactory::instance()) {
|
| handle.parent_client_id =
|
| BrowserGpuChannelHostFactory::instance()->GetGpuChannelId();
|
| }
|
|
|