Fix bug in shut down of HTMLViewer

components/html_viewer/global_state.h

Index: components/html_viewer/global_state.h
diff --git a/components/html_viewer/global_state.h b/components/html_viewer/global_state.h
index 5efa71812db5320079e56cee51d69afd1cee7789..28ee041c6950e1763ee6685a21054e68a8816eaf 100644
--- a/components/html_viewer/global_state.h
+++ b/components/html_viewer/global_state.h
@@ -12,8 +12,13 @@
 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h"
 #include "components/mus/gles2/raster_thread_helper.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
+#include "skia/ext/refptr.h"
 #include "ui/gfx/geometry/size.h"
 
+namespace font_service {
+class FontLoader;
+}
+
 namespace mojo {
 class ApplicationImpl;
 class Shell;
@@ -107,6 +112,10 @@ class GlobalState {
   gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
   scoped_ptr<MediaFactory> media_factory_;
 
+#if defined(OS_LINUX) && !defined(OS_ANDROID)
+  skia::RefPtr<font_service::FontLoader> font_loader_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(GlobalState);
 };