Fix bug in shut down of HTMLViewer

Fix bug in shut down of HTMLViewer

Without this the background thread created by the FontLoader outlives
the HTMLViewer, which leads to random shutdown crashes.

BUG=531120
TEST=none
R=erg@chromium.org

Committed: https://crrev.com/e9a036258ac17b528ef498998a50d83393ec807b
Cr-Commit-Position: refs/heads/master@{#348769}

[Elliot Glaysher, 2015-09-14 20:19:32]

lgtm

Do you need to do something similar in mandoline/ui/aura/aura_init.cc, which is
the other place we use font_service?

[sky, 2015-09-14 20:20:42]

The CQ bit was checked by sky@chromium.org

[commit-bot: I haz the power, 2015-09-14 20:21:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1341073004/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1341073004/1

[commit-bot: I haz the power, 2015-09-14 22:13:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-14 22:13:22]

Failed to apply patch for components/html_viewer/global_state.h:
While running git apply --index -3 -p1;
  error: patch failed: components/html_viewer/global_state.h:12
  Falling back to three-way merge...
  Applied patch to 'components/html_viewer/global_state.h' with conflicts.
  U components/html_viewer/global_state.h

Patch:       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
624256ea4e86cf1186bf6c7e96bf29af9d00b62c..2f57baab352be2d4bc736d131916338eca8f5872
100644
--- a/components/html_viewer/global_state.h
+++ b/components/html_viewer/global_state.h
@@ -12,8 +12,13 @@
 #include "components/resource_provider/public/cpp/resource_loader.h"
 #include "components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h"
 #include "components/view_manager/gles2/raster_thread_helper.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);
 };

[sky, 2015-09-14 22:24:19]

The CQ bit was checked by sky@chromium.org

[sky, 2015-09-14 22:24:20]

The patchset sent to the CQ was uploaded after l-g-t-m from erg@chromium.org
Link to the patchset: https://codereview.chromium.org/1341073004/#ps20001
(title: "merge 2 trunk")

[commit-bot: I haz the power, 2015-09-14 22:26:56]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1341073004/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1341073004/20001

[commit-bot: I haz the power, 2015-09-14 23:41:22]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-09-14 23:42:11]

Patchset 2 (id:??) landed as
https://crrev.com/e9a036258ac17b528ef498998a50d83393ec807b
Cr-Commit-Position: refs/heads/master@{#348769}

[commit-bot: I haz the power, 2015-09-23 12:39:17]

Patchset 2 (id:??) landed as
https://crrev.com/e9a036258ac17b528ef498998a50d83393ec807b
Cr-Commit-Position: refs/heads/master@{#348769}