[content shell] only send the hyphenation file after the process was created

content/shell/shell_content_browser_client.cc

 // 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/shell/shell_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/geolocation/shell_access_token_store.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_browser_main_parts.h"
 #include "content/shell/shell_devtools_delegate.h"
 #include "content/shell/shell_message_filter.h"
@@ skipping 90 matching lines @@
     RenderProcessHost* host) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     return;
   host->GetChannel()->AddFilter(new ShellMessageFilter(
       host->GetID(),
       BrowserContext::GetDefaultStoragePartition(browser_context())
           ->GetDatabaseTracker(),
       BrowserContext::GetDefaultStoragePartition(browser_context())
           ->GetQuotaManager()));
   host->Send(new ShellViewMsg_SetWebKitSourceDir(webkit_source_dir_));
-
-  if (hyphen_dictionary_file_ != base::kInvalidPlatformFileValue) {
-    IPC::PlatformFileForTransit file = IPC::GetFileHandleForProcess(
-        hyphen_dictionary_file_, host->GetHandle(), false);
-    host->Send(new ShellViewMsg_LoadHyphenDictionary(file));
-  }
+  registrar_.Add(this,
+                 NOTIFICATION_RENDERER_PROCESS_CREATED,
+                 Source<RenderProcessHost>(host));
 }
 
 net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
     BrowserContext* content_browser_context,
     ProtocolHandlerMap* protocol_handlers) {
   ShellBrowserContext* shell_browser_context =
       ShellBrowserContextForBrowserContext(content_browser_context);
   return shell_browser_context->CreateRequestContext(protocol_handlers);
 }
 
@@ skipping 72 matching lines @@
   if (f == base::kInvalidPlatformFileValue) {
     NOTREACHED() << "Failed to open file when creating renderer process: "
                  << "content_shell.pak";
   }
   mappings->push_back(
       content::FileDescriptorInfo(kShellPakDescriptor,
                                   base::FileDescriptor(f, true)));
 }
 #endif
 
+void ShellContentBrowserClient::Observe(int type,
+                                        const NotificationSource& source,
+                                        const NotificationDetails& details) {
+  switch (type) {
+    case NOTIFICATION_RENDERER_PROCESS_CREATED: {
+      registrar_.Remove(this,
+                        NOTIFICATION_RENDERER_PROCESS_CREATED,
+                        source);
+      if (hyphen_dictionary_file_ != base::kInvalidPlatformFileValue) {
+        RenderProcessHost* host = Source<RenderProcessHost>(source).ptr();
+        IPC::PlatformFileForTransit file = IPC::GetFileHandleForProcess(
+            hyphen_dictionary_file_, host->GetHandle(), false);
+        host->Send(new ShellViewMsg_LoadHyphenDictionary(file));
+      }
+      break;
+    }
+
+    default:
+      NOTREACHED();
+  }
+}
+
 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
   return shell_browser_main_parts_->browser_context();
 }
 
 ShellBrowserContext*
     ShellContentBrowserClient::off_the_record_browser_context() {
   return shell_browser_main_parts_->off_the_record_browser_context();
 }
 
 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
   return new ShellAccessTokenStore(browser_context()->GetRequestContext());
 }
 
 ShellBrowserContext*
 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
     BrowserContext* content_browser_context) {
   if (content_browser_context == browser_context())
     return browser_context();
   DCHECK_EQ(content_browser_context, off_the_record_browser_context());
   return off_the_record_browser_context();
 }
 
 }  // namespace content