Revert of Enable Enterprise enrollment on desktop builds.

chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
@@ skipping 332 matching lines @@
       user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
     }
   }
 #endif
 #if defined(OS_MACOSX) || defined(OS_WIN)
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
 #endif
 
   const bool specified_directory_was_invalid = !user_data_dir.empty() &&
       !PathService::OverrideAndCreateIfNeeded(chrome::DIR_USER_DATA,
-          user_data_dir, false, true);
+          user_data_dir, true);
   // Save inaccessible or invalid paths so the user may be prompted later.
   if (specified_directory_was_invalid)
     chrome::SetInvalidSpecifiedUserDataDir(user_data_dir);
 
   // Warn and fail early if the process fails to get a user data directory.
   if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
     // If an invalid command-line or policy override was specified, the user
     // will be given an error with that value. Otherwise, use the directory
     // returned by PathService (or the fallback default directory) in the error.
     if (!specified_directory_was_invalid) {
@@ skipping 546 matching lines @@
 }
 
 content::ContentUtilityClient*
 ChromeMainDelegate::CreateContentUtilityClient() {
 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return g_chrome_content_utility_client.Pointer();
 #endif
 }