Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: mojo/application/public/cpp/initialize_base_and_icu.cc

Issue 1429263005: Revert of mandoline: Fix ICU initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/application/public/cpp/BUILD.gn ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/application/public/cpp/initialize_base_and_icu.cc
diff --git a/mojo/application/public/cpp/initialize_base_and_icu.cc b/mojo/application/public/cpp/initialize_base_and_icu.cc
deleted file mode 100644
index dd65129aaf90ba56dd296b4e6bb3e987ac0e7ec1..0000000000000000000000000000000000000000
--- a/mojo/application/public/cpp/initialize_base_and_icu.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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.
-
-// This file declares a raw symbol and should be included only once in a
-// certain binary target. This needs to be run before we raise the sandbox,
-// which means that it can't use mojo. Our runners will dig around in the
-// symbol table and run this before the mojo system is initialized.
-
-#include "base/files/file.h"
-#include "base/i18n/icu_util.h"
-#include "base/rand_util.h"
-#include "base/sys_info.h"
-#include "mojo/public/c/system/types.h"
-#include "third_party/icu/source/i18n/unicode/timezone.h"
-
-extern "C" {
-#if defined(WIN32)
-__declspec(dllexport) void __cdecl
-#else
-void __attribute__((visibility("default")))
-#endif
-InitializeBase(const uint8* icu_data) {
- base::RandUint64();
- base::SysInfo::AmountOfPhysicalMemory();
- base::SysInfo::NumberOfProcessors();
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
- base::SysInfo::MaxSharedMemorySize();
-#endif
-
- // Initialize core ICU. We must perform the full initialization before we
- // initialize icu::TimeZone subsystem because otherwise ICU gets in a state
- // where the timezone data is disconnected from the locale data which can
- // cause crashes.
- CHECK(base::i18n::InitializeICUFromRawMemory(icu_data));
-
- // ICU DateFormat class (used in base/time_format.cc) needs to get the
- // Olson timezone ID by accessing the zoneinfo files on disk. After
- // TimeZone::createDefault is called once here, the timezone ID is
- // cached and there's no more need to access the file system.
- scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
-}
-}
« no previous file with comments | « mojo/application/public/cpp/BUILD.gn ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698