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

@@ -21,6 +21,7 @@
#include "components/net_log/chrome_net_log.h"
#include "components/net_log/net_export_file_writer.h"
#include "components/prefs/pref_service.h"
#include "content/browser/startup_helper.h"
#include "content/public/common/content_switches.h"
#include "services/network/public/cpp/network_switches.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -41,6 +42,9 @@ void ChromeBrowserProcessStub::Initialize() {
DCHECK(!context_initialized_);
DCHECK(!shutdown_);
// Initialize this early before any code tries to check feature flags.
content::SetUpFieldTrialsAndFeatureList();
const CefSettings& settings = CefContext::Get()->settings();
const base::FilePath& cache_path =
base::FilePath(CefString(&settings.cache_path));