Revert of mandoline: Fix ICU initialization.

components/html_viewer/global_state.cc

 // Copyright 2015 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 "components/html_viewer/global_state.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "components/html_viewer/blink_platform_impl.h"
 #include "components/html_viewer/blink_settings_impl.h"
 #include "components/html_viewer/media_factory.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "gin/v8_initializer.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/logging/init_logging.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "third_party/WebKit/public/web/WebKit.h"
@@ skipping 117 matching lines @@
       resource_loader_.ReleaseFile(kResourceSnapshotBlob).TakePlatformFile(),
       0u, 0u);
   gin::V8Initializer::LoadV8NativesFromFD(
       resource_loader_.ReleaseFile(kResourceNativesBlob).TakePlatformFile(), 0u,
       0u);
 #endif
   blink::initialize(blink_platform_.get());
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::File pak_file = resource_loader_.ReleaseFile(kResourceResourcesPak);
 
-  bool initialize_ui = true;
+  bool initialize_icu_and_ui = true;
 #if defined(COMPONENT_BUILD)
   if (command_line->HasSwitch("single-process"))
-    initialize_ui = false;
+    initialize_icu_and_ui = false;
 #endif
-  if (initialize_ui) {
+  if (initialize_icu_and_ui) {
+    base::i18n::InitializeICUWithFileDescriptor(
+        resource_loader_.GetICUFile().TakePlatformFile(),
+        base::MemoryMappedFile::Region::kWholeFile);
     ui::RegisterPathProvider();
     base::File pak_file_2 = pak_file.Duplicate();
     ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
       pak_file_2.Pass(), base::MemoryMappedFile::Region::kWholeFile);
   }
 
   mojo::logging::InitLogging();
 
   if (command_line->HasSwitch(kDisableEncryptedMedia))
     blink::WebRuntimeFeatures::enableEncryptedMedia(false);
@@ skipping 23 matching lines @@
   return gpu_info_.get();
 }
 
 void GlobalState::GetGpuInfoCallback(mus::mojom::GpuInfoPtr gpu_info) {
   CHECK(gpu_info);
   gpu_info_ = gpu_info.Pass();
   gpu_service_.reset();
 }
 
 }  // namespace html_viewer