Fix bug in shut down of HTMLViewer

components/html_viewer/global_state.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
 #define COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "components/html_viewer/discardable_memory_allocator.h"
 #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;
 }
 
 namespace ui {
 namespace mojo {
 class UIInit;
 }
 }
@@ skipping 73 matching lines @@
   // memory based purging allocator working here.
   DiscardableMemoryAllocator discardable_memory_allocator_;
 
   scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_;
   scoped_ptr<BlinkPlatformImpl> blink_platform_;
   base::Thread compositor_thread_;
   gles2::RasterThreadHelper raster_thread_helper_;
   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);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_