[Upstream] Force instantiation of BSKSF during unit tests

ios/chrome/test/ios_chrome_unit_test_suite.cc

 // 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.
 
 #include "ios/chrome/test/ios_chrome_unit_test_suite.h"
 
+#include "ios/chrome/browser/browser_state/browser_state_keyed_service_factories.h"
+#include "ios/chrome/browser/chrome_paths.h"
 #include "ios/public/test/test_chrome_browser_provider.h"
 #include "ios/public/test/test_chrome_provider_initializer.h"
 #include "ios/web/public/web_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
 #include "url/url_util.h"
 
 namespace {
 
 class IOSChromeUnitTestSuiteInitializer
@@ skipping 32 matching lines @@
 }
 
 void IOSChromeUnitTestSuite::Initialize() {
   // Add an additional listener to do the extra initialization for unit tests.
   // It will be started before the base class listeners and ended after the
   // base class listeners.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new IOSChromeUnitTestSuiteInitializer);
 
+  // Ensure that all BrowserStateKeyedServiceFactories are built before any
+  // test is run so that the dependencies are correctly resolved.
+  EnsureBrowserStateKeyedServiceFactoriesBuilt();
+
+  ios::RegisterPathProvider();
   ui::RegisterPathProvider();
 
   {
     ios::TestChromeBrowserProvider provider;
     url::AddStandardScheme(provider.GetChromeUIScheme());
   }
 
   base::TestSuite::Initialize();
 }