OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/plugin/chrome_content_plugin_client.h" | 5 #include "chrome/plugin/chrome_content_plugin_client.h" |
6 | 6 |
7 #if defined(ENABLE_REMOTING) | 7 #if defined(ENABLE_REMOTING) |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "content/public/common/content_paths.h" | 10 #include "content/public/common/content_paths.h" |
(...skipping 17 matching lines...) Expand all Loading... | |
28 gin::V8Initializer::LoadV8Snapshot(); | 28 gin::V8Initializer::LoadV8Snapshot(); |
29 gin::V8Initializer::LoadV8Natives(); | 29 gin::V8Initializer::LoadV8Natives(); |
30 #endif | 30 #endif |
31 | 31 |
32 #if defined(ENABLE_REMOTING) | 32 #if defined(ENABLE_REMOTING) |
33 | 33 |
34 // Load crypto libraries for the Chromoting client plugin. | 34 // Load crypto libraries for the Chromoting client plugin. |
35 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS) | 35 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS) |
36 // On platforms where we use system NSS libraries, the .so's must be loaded | 36 // On platforms where we use system NSS libraries, the .so's must be loaded |
37 // before the sandbox is initialized. | 37 // before the sandbox is initialized. |
38 crypto::ForceNSSNoDBInit(); | 38 crypto::InitNSSSafely(); |
jln (very slow on Chromium)
2015/07/07 17:45:36
It looks like this shouldn't be needed because con
davidben
2015/07/07 18:14:48
Yeah, it's a bit of a mess. I should probably have
Ryan Sleevi
2015/07/08 10:54:25
Right, I think we actually want to delete this cod
| |
39 crypto::EnsureNSSInit(); | |
40 #elif defined(OS_WIN) | 39 #elif defined(OS_WIN) |
41 // crypt32.dll is used to decode X509 certificates for Chromoting. | 40 // crypt32.dll is used to decode X509 certificates for Chromoting. |
42 base::NativeLibraryLoadError error; | 41 base::NativeLibraryLoadError error; |
43 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) | 42 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) |
44 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); | 43 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); |
45 #endif // defined(OS_WIN) | 44 #endif // defined(OS_WIN) |
46 | 45 |
47 // Initialize media libraries for the Chromoting client plugin. | 46 // Initialize media libraries for the Chromoting client plugin. |
48 media::InitializeMediaLibrary(); | 47 media::InitializeMediaLibrary(); |
49 | 48 |
50 #endif // defined(ENABLE_REMOTING) | 49 #endif // defined(ENABLE_REMOTING) |
51 } | 50 } |
52 | 51 |
53 } // namespace chrome | 52 } // namespace chrome |
OLD | NEW |