Linux: Fix NetworkService startup assertion in FeatureList::InitializeInstance (see issue #2622).

This commit is contained in:
Marshall Greenblatt
2019-04-26 13:22:07 -07:00
parent 8a4f4bff9b
commit cc80175e89
2 changed files with 4 additions and 6 deletions

View File

@@ -25,7 +25,6 @@
#include "base/threading/thread_restrictions.h"
#include "components/network_session_configurator/common/network_switches.h"
#include "content/app/content_service_manager_main_delegate.h"
#include "content/browser/startup_helper.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
@@ -428,11 +427,6 @@ bool CefContext::Initialize(const CefMainArgs& args,
base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED);
// This is required because creating a base::Thread as starting it will
// check some feature flags this will cause a CHECK failure later when this
// gets called by some call down the line of service_manager::MainRun.
content::SetUpFieldTrialsAndFeatureList();
if (!main_delegate_->CreateUIThread(base::BindOnce(
[](CefContext* context, base::WaitableEvent* event) {
service_manager::MainRun(*context->sm_main_params_);