Make IPC::Channel::Listener:OnMessageReceived have a return value indicating ...

chrome/service/service_utility_process_host.cc

 // Copyright (c) 2010 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 "chrome/service/service_utility_process_host.h"
 
 #include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 110 matching lines @@
     // If we are yet to receive a reply then notify the client that the
     // child died.
     client_message_loop_proxy_->PostTask(
         FROM_HERE,
         NewRunnableMethod(client_.get(), &Client::OnChildDied));
   }
   // The base class implementation will delete |this|.
   ServiceChildProcessHost::OnChildDied();
 }
 
-void ServiceUtilityProcessHost::OnMessageReceived(const IPC::Message& message) {
+bool ServiceUtilityProcessHost::OnMessageReceived(const IPC::Message& message) {
   bool msg_is_ok = false;
   IPC_BEGIN_MESSAGE_MAP_EX(ServiceUtilityProcessHost, message, msg_is_ok)
 #if defined(OS_WIN)  // This hack is Windows-specific.
     IPC_MESSAGE_HANDLER(UtilityHostMsg_PreCacheFont, OnPreCacheFont)
 #endif
     IPC_MESSAGE_HANDLER(UtilityHostMsg_RenderPDFPagesToMetafile_Succeeded,
                         OnRenderPDFPagesToMetafileSucceeded)
     IPC_MESSAGE_UNHANDLED(msg_is_ok__ = MessageForClient(message))
   IPC_END_MESSAGE_MAP_EX()
+  return true;
 }
 
 bool ServiceUtilityProcessHost::MessageForClient(const IPC::Message& message) {
   DCHECK(waiting_for_reply_);
   bool ret = client_message_loop_proxy_->PostTask(
       FROM_HERE,
       NewRunnableMethod(client_.get(), &Client::OnMessageReceived,
                         message));
   waiting_for_reply_ = false;
   return ret;
@@ skipping 14 matching lines @@
   scratch_metafile_dir_->Take();
   client_message_loop_proxy_->PostTask(
       FROM_HERE,
       NewRunnableMethod(client_.get(),
                         &Client::MetafileAvailable,
                         metafile_path_,
                         highest_rendered_page_number));
   waiting_for_reply_ = false;
 }
 
-void ServiceUtilityProcessHost::Client::OnMessageReceived(
+bool ServiceUtilityProcessHost::Client::OnMessageReceived(
     const IPC::Message& message) {
+  bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceUtilityProcessHost, message)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_RenderPDFPagesToMetafile_Failed,
                         Client::OnRenderPDFPagesToMetafileFailed)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded,
                         Client::OnGetPrinterCapsAndDefaultsSucceeded)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_GetPrinterCapsAndDefaults_Failed,
                         Client::OnGetPrinterCapsAndDefaultsFailed)
+    IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
+  return handled;
 }
 
 void ServiceUtilityProcessHost::Client::MetafileAvailable(
     const FilePath& metafile_path,
     int highest_rendered_page_number) {
   // The metafile was created in a temp folder which needs to get deleted after
   // we have processed it.
   ScopedTempDir scratch_metafile_dir;
   scratch_metafile_dir.Set(metafile_path.DirName());
 #if defined(OS_WIN)
   printing::NativeMetafile metafile;
   if (!metafile.CreateFromFile(metafile_path)) {
     OnRenderPDFPagesToMetafileFailed();
   } else {
     OnRenderPDFPagesToMetafileSucceeded(metafile, highest_rendered_page_number);
     // Close it so that ScopedTempDir can delete the folder.
     metafile.CloseEmf();
   }
 #endif  // defined(OS_WIN)
 }