mandoline: Reland "Fix ICU initialization".

mojo/runner/context.cc

 // Copyright 2013 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 "mojo/runner/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process/process_info.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 169 matching lines @@
       *base::CommandLine::ForCurrentProcess();
 
   bool trace_startup = command_line.HasSwitch(switches::kTraceStartup);
   if (trace_startup) {
     tracer_.Start(
         command_line.GetSwitchValueASCII(switches::kTraceStartup),
         command_line.GetSwitchValueASCII(switches::kTraceStartupDuration),
         "mojo_runner.trace");
   }
 
+  // ICU data is a thing every part of the system needs. This here warms
+  // up the copy of ICU in the mojo runner.
+  CHECK(base::i18n::InitializeICU());
+
   EnsureEmbedderIsInitialized();
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->task_runner()));
 
   // TODO(vtl): This should be MASTER, not NONE.
   embedder::InitIPCSupport(
       embedder::ProcessType::NONE, task_runners_->shell_runner(), this,
       task_runners_->io_runner(), embedder::ScopedPlatformHandle());
 
   package_manager_ = new package_manager::PackageManagerImpl(
@@ skipping 124 matching lines @@
         base::MessageLoop::current()->QuitWhenIdle();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo