Update to Chromium version 68.0.3433.0 (#559327)

Known issues:
- Windows now requires VS 2017 15.7.1 with 10.0.17134.0 SDK.
This commit is contained in:
Marshall Greenblatt
2018-05-21 15:54:08 +03:00
parent 12cc069b69
commit 08ff72fa20
55 changed files with 414 additions and 356 deletions

View File

@@ -18,6 +18,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/crash/core/common/crash_key.h"
#include "services/service_manager/embedder/switches.h"
#include "third_party/crashpad/crashpad/client/annotation.h"
#if defined(OS_MACOSX)
@@ -603,16 +604,17 @@ bool CefCrashReporterClient::GetCrashMetricsLocation(
void CefCrashReporterClient::GetProductNameAndVersion(const char** product_name,
const char** version) {
GetProductNameAndVersion(product_name, version, nullptr);
}
void CefCrashReporterClient::GetProductNameAndVersion(const char** product_name,
const char** version,
const char** channel) {
*product_name = product_name_.c_str();
*version = product_version_.c_str();
}
void CefCrashReporterClient::GetProductNameAndVersion(std::string* product_name,
std::string* version,
std::string* channel) {
*product_name = product_name_;
*version = product_version_;
}
#if !defined(OS_MACOSX)
base::FilePath CefCrashReporterClient::GetReporterLogFilename() {
@@ -623,7 +625,7 @@ bool CefCrashReporterClient::EnableBreakpadForProcess(
const std::string& process_type) {
return process_type == switches::kRendererProcess ||
process_type == switches::kPpapiPluginProcess ||
process_type == switches::kZygoteProcess ||
process_type == service_manager::switches::kZygoteProcess ||
process_type == switches::kGpuProcess;
}

View File

@@ -53,9 +53,9 @@ class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
#elif defined(OS_POSIX)
void GetProductNameAndVersion(const char** product_name,
const char** version) override;
void GetProductNameAndVersion(const char** product_name,
const char** version,
const char** channel) override;
void GetProductNameAndVersion(std::string* product_name,
std::string* version,
std::string* channel) override;
#if !defined(OS_MACOSX)
base::FilePath GetReporterLogFilename() override;
bool EnableBreakpadForProcess(const std::string& process_type) override;

View File

@@ -16,6 +16,7 @@
#include "components/crash/core/common/crash_key.h"
#include "components/crash/core/common/crash_keys.h"
#include "content/public/common/content_switches.h"
#include "services/service_manager/embedder/switches.h"
#if defined(OS_MACOSX)
#include "base/mac/foundation_util.h"
@@ -130,7 +131,7 @@ void InitCrashReporter(const base::CommandLine& command_line,
#else // !defined(OS_MACOSX)
breakpad::SetCrashServerURL(crash_client->GetCrashServerURL());
if (process_type != switches::kZygoteProcess) {
if (process_type != service_manager::switches::kZygoteProcess) {
// Crash reporting for subprocesses created using the zygote will be
// initialized in ZygoteForked.
breakpad::InitCrashReporter(process_type);

View File

@@ -5,9 +5,9 @@
"service_manager:connector": {
"provides": {
"renderer": [
"blink::mojom::BudgetService",
"metrics::mojom::LeakDetector",
"mojom::ModuleEventSink"
"blink.mojom.BudgetService",
"metrics.mojom.LeakDetector",
"mojom.ModuleEventSink"
]
},
"requires": {
@@ -18,9 +18,9 @@
"navigation:frame": {
"provides": {
"renderer": [
"blink::mojom::BudgetService",
"extensions::KeepAlive",
"extensions::mime_handler::MimeHandlerService"
"blink.mojom.BudgetService",
"extensions.KeepAlive",
"extensions.mime_handler.MimeHandlerService"
]
}
}

View File

@@ -4,7 +4,7 @@
"service_manager:connector": {
"provides": {
"browser": [
"spellcheck::mojom::SpellChecker"
"spellcheck.mojom.SpellChecker"
]
},
"requires": {

View File

@@ -4,7 +4,7 @@
"service_manager:connector": {
"provides": {
"browser": [
"net::interfaces::ProxyResolverFactory"
"net.interfaces.ProxyResolverFactory"
]
}
}

View File

@@ -25,6 +25,7 @@
#include "content/public/common/content_switches.h"
#include "media/cdm/cdm_host_file.h"
#include "media/cdm/supported_cdm_versions.h"
#include "services/service_manager/embedder/switches.h"
#include "services/service_manager/sandbox/switches.h"
namespace {
@@ -430,7 +431,7 @@ void CefWidevineLoader::AddContentDecryptionModules(
// errors during plugin loading. This is because the Zygote process must pre-
// load all plugins before initializing the sandbox.
if (command_line.GetSwitchValueASCII(switches::kProcessType) !=
switches::kZygoteProcess ||
service_manager::switches::kZygoteProcess ||
command_line.HasSwitch(service_manager::switches::kNoSandbox)) {
return;
}