Revert "[M120 Migration]Fix for crash during chrome exit"

Original commit 5067b78 disabled Crypto related code which was causing crash
in M108. On M120, the block of code is needed as os_crypto_linux_impl.cc
is compiled, hence reverting the original commit to fix the chrome
hang/crash issue after launch.

Change-Id: If2a554fe3de96c3705e162694194bbc226f9e921
Signed-off-by: Rohit Kumar <rohit.16@partner.samsung.com>

diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index 2e65a9f..0d3bc8c 100644 (file)
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -66,9 +66,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
   // initialization depend on FeatureList, and is done elsewhere.
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
+#if !BUILDFLAG(IS_CHROMEOS)
   bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
 
-#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_TIZEN)
   // Set up crypt config. This needs to be done before anything starts the
   // network service, as the raw encryption key needs to be shared with the
   // network service for encrypted cookie storage.