Fix destruction order between SurfaceManger and OffscreenCanvasSurfaceImpl

content/browser/renderer_host/offscreen_canvas_surface_impl.cc

Index: content/browser/renderer_host/offscreen_canvas_surface_impl.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
index edbed1acad500d6efd8bbfec98f50754cfea202f..1988292d7d0e700acf814d0da38f7b96bc6f7c00 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
+++ b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
@@ -9,6 +9,7 @@
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "content/public/browser/browser_thread.h"
+#include <iostream>
 
 namespace content {
 
@@ -25,6 +26,12 @@ OffscreenCanvasSurfaceImpl::OffscreenCanvasSurfaceImpl(
       binding_(this, std::move(request)) {}
 
 OffscreenCanvasSurfaceImpl::~OffscreenCanvasSurfaceImpl() {
+    if (!GetSurfaceManager()) {

[Justin Novosad, 2016/06/22 20:47:09]

Is is not possible to call GetSurfaceManager in SurfaceFactory?  Would be nice
to just get rid of SurfaceFactory::manager_

[xlai (Olivia), 2016/06/23 14:49:38]

Cannot...cc/ folder cannot import things from content/...

+        std::cout << "surface manager no longer exists! " << std::endl;
+        surface_factory_->onSurfaceManagerDestroyed();
+    }
+    surface_factory_.reset();
+    //surface_factory_->DestroyAll();
 }
 
 void OffscreenCanvasSurfaceImpl::GetSurfaceId(