Convert pepper font list to new resource system.

content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc

Index: content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d3b49d8893ac68fac1adc1db7762983377cf8b22
--- /dev/null
+++ b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
@@ -0,0 +1,110 @@
+// Copyright (c) 2012 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.
+
+#include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h"
+
+#include "base/threading/sequenced_worker_pool.h"
+#include "base/values.h"
+#include "content/common/font_list.h"
+#include "content/public/browser/browser_ppapi_host.h"
+#include "content/public/browser/browser_thread.h"
+#include "ppapi/host/dispatch_host_message.h"
+#include "ppapi/proxy/ppapi_messages.h"
+
+namespace content {
+
+namespace {
+
+// Handles the font list request on the blocking pool.
+class FontMessageFilter : public ppapi::host::ResourceMessageFilter {
+ public:
+  FontMessageFilter();
+
+  // ppapi::host::ResourceMessageFilter implementation.
+  virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
+      const IPC::Message& msg) OVERRIDE;
+  virtual int32_t OnResourceMessageReceived(
+      const IPC::Message& msg,
+      ppapi::host::HostMessageContext* context) OVERRIDE;
+
+ private:
+  virtual ~FontMessageFilter();
+
+  // Message handler.
+  int32_t OnHostMsgGetFontFamilies(ppapi::host::HostMessageContext* context);
+
+  DISALLOW_COPY_AND_ASSIGN(FontMessageFilter);
+};
+
+FontMessageFilter::FontMessageFilter() {
+}
+
+FontMessageFilter::~FontMessageFilter() {
+}
+
+scoped_refptr<base::TaskRunner> FontMessageFilter::OverrideTaskRunnerForMessage(
+    const IPC::Message& msg) {
+  // Use the blocking pool to get the font list (currently the only message
+  // so we can always just return it).
+  return scoped_refptr<base::TaskRunner>(BrowserThread::GetBlockingPool());
+}
+
+int32_t FontMessageFilter::OnResourceMessageReceived(
+    const IPC::Message& msg,
+    ppapi::host::HostMessageContext* context) {
+  IPC_BEGIN_MESSAGE_MAP(FontMessageFilter, msg)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
+        PpapiHostMsg_BrowserFontSingleton_GetFontFamilies,
+        OnHostMsgGetFontFamilies)
+  IPC_END_MESSAGE_MAP()
+  return PP_ERROR_FAILED;
+}
+
+int32_t FontMessageFilter::OnHostMsgGetFontFamilies(
+    ppapi::host::HostMessageContext* context) {
+  // OK to use "slow blocking" version since we're on the blocking pool.
+  scoped_ptr<base::ListValue> list(GetFontList_SlowBlocking());
+
+  std::string output;
+  for (size_t i = 0; i < list->GetSize(); i++) {
+    base::ListValue* cur_font;
+    if (!list->GetList(i, &cur_font))
+      continue;
+
+    // Each entry is actually a list of (font name, localized name).
+    // We only care about the regular name.
+    std::string font_name;
+    if (!cur_font->GetString(0, &font_name))
+      continue;
+
+    // Font names are separated with nulls. We also want an explicit null at
+    // the end of the string (Pepper strings aren't null terminated so since
+    // we specify there will be a null, it should actually be in the string).
+    output.append(font_name);
+    output.push_back(0);
+  }
+
+  ppapi::host::ReplyMessageContext reply_context =
+      context->MakeReplyMessageContext();
+  SendReply(reply_context,
+            PpapiPluginMsg_BrowserFontSingleton_GetFontFamiliesReply(
+                output));
+  return PP_OK_COMPLETIONPENDING;

[raymes, 2012/12/17 00:08:29]

You can actually change the above few lines to:
context->reply_msg =
PpapiPluginMsg_BrowserFontSingleton_GetFontFamiliesReply(output);
return PP_OK;

+}
+
+}  // namespace
+
+PepperBrowserFontSingletonHost::PepperBrowserFontSingletonHost(

[raymes, 2012/12/17 00:08:29]

We seem to be having this pattern quite a lot where the host is empty except for
having a message filter in it. I think we can make the code cleaner by having a
generic "MessageFilterHost" which just takes a filter on construction.

This CL is fine though. I'll make the change separately.

+    BrowserPpapiHost* host,
+    PP_Instance instance,
+    PP_Resource resource)
+    : ResourceHost(host->GetPpapiHost(), instance, resource) {
+  AddFilter(scoped_refptr<ppapi::host::ResourceMessageFilter>(
+      new FontMessageFilter()));
+}
+
+PepperBrowserFontSingletonHost::~PepperBrowserFontSingletonHost() {
+}
+
+}  // namespace content