Revert of Make Crashpad use the user data dir, rather than always default location

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 <stddef.h>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 342 matching lines @@
 #endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
 #endif  // OS_POSIX
 
 struct MainFunction {
   const char* name;
   int (*function)(const content::MainFunctionParams&);
 };
 
 // Initializes the user data dir. Must be called before InitializeLocalState().
-void InitializeUserDataDir(base::CommandLine* command_line) {
-#if defined(OS_WIN)
-  wchar_t user_data_dir_buf[MAX_PATH], invalid_user_data_dir_buf[MAX_PATH];
-
-  using GetUserDataDirectoryThunkFunction =
-      void (*)(wchar_t*, size_t, wchar_t*, size_t);
-  HMODULE elf_module = GetModuleHandle(chrome::kChromeElfDllName);
-  if (elf_module) {
-    // If we're in a test, chrome_elf won't be loaded.
-    GetUserDataDirectoryThunkFunction get_user_data_directory_thunk =
-        reinterpret_cast<GetUserDataDirectoryThunkFunction>(
-            GetProcAddress(elf_module, "GetUserDataDirectoryThunk"));
-    get_user_data_directory_thunk(
-        user_data_dir_buf, arraysize(user_data_dir_buf),
-        invalid_user_data_dir_buf, arraysize(invalid_user_data_dir_buf));
-    base::FilePath user_data_dir(user_data_dir_buf);
-    if (invalid_user_data_dir_buf[0] != 0) {
-      chrome::SetInvalidSpecifiedUserDataDir(
-          base::FilePath(invalid_user_data_dir_buf));
-      command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
-    }
-    CHECK(PathService::OverrideAndCreateIfNeeded(chrome::DIR_USER_DATA,
-                                                 user_data_dir, false, true));
-  } else {
-    // In tests, just respect the flag if given.
-    base::FilePath user_data_dir =
-        command_line->GetSwitchValuePath(switches::kUserDataDir);
-    if (user_data_dir.EndsWithSeparator())
-      user_data_dir = user_data_dir.StripTrailingSeparators();
-    CHECK(PathService::OverrideAndCreateIfNeeded(chrome::DIR_USER_DATA,
-                                                 user_data_dir, false, true));
-  }
-#else  // OS_WIN
+void InitializeUserDataDir() {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::FilePath user_data_dir =
       command_line->GetSwitchValuePath(switches::kUserDataDir);
   std::string process_type =
       command_line->GetSwitchValueASCII(switches::kProcessType);
 
 #if defined(OS_LINUX)
   // On Linux, Chrome does not support running multiple copies under different
   // DISPLAYs, so the profile directory can be specified in the environment to
   // support the virtual desktop use-case.
   if (user_data_dir.empty()) {
     std::string user_data_dir_string;
     std::unique_ptr<base::Environment> environment(base::Environment::Create());
     if (environment->GetVar("CHROME_USER_DATA_DIR", &user_data_dir_string) &&
         base::IsStringUTF8(user_data_dir_string)) {
       user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
     }
   }
-#endif  // OS_LINUX
-#if defined(OS_MACOSX)
+#endif
+#if defined(OS_MACOSX) || defined(OS_WIN)
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
-#endif  // OS_MAC
+#endif
+
+  // On Windows, trailing separators leave Chrome in a bad state.
+  // See crbug.com/464616.
+  if (user_data_dir.EndsWithSeparator())
+    user_data_dir = user_data_dir.StripTrailingSeparators();
 
   const bool specified_directory_was_invalid = !user_data_dir.empty() &&
       !PathService::OverrideAndCreateIfNeeded(chrome::DIR_USER_DATA,
           user_data_dir, false, 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)) {
@@ skipping 12 matching lines @@
     // The browser process (which is identified by an empty |process_type|) will
     // handle the error later; other processes that need the dir crash here.
     CHECK(process_type.empty()) << "Unable to get the user data directory "
                                 << "for process type: " << process_type;
   }
 
   // Append the fallback user data directory to the commandline. Otherwise,
   // child or service processes will attempt to use the invalid directory.
   if (specified_directory_was_invalid)
     command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
-#endif  // OS_WIN
 }
 
 #if !defined(OS_ANDROID)
 void InitLogging(const std::string& process_type) {
   logging::OldFileDeletionState file_state =
       logging::APPEND_TO_OLD_LOG_FILE;
   if (process_type.empty()) {
     file_state = logging::DELETE_OLD_LOG_FILE;
   }
   const base::CommandLine& command_line =
@@ skipping 309 matching lines @@
   child_process_logging::Init();
 #endif
 #if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
   // Create an instance of the CPU class to parse /proc/cpuinfo and cache
   // cpu_brand info.
   base::CPU cpu_info;
 #endif
 
   // Initialize the user data dir for any process type that needs it.
   if (chrome::ProcessNeedsProfileDir(process_type)) {
-    InitializeUserDataDir(base::CommandLine::ForCurrentProcess());
+    InitializeUserDataDir();
 #if defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL_CHILD)
     if (downgrade::IsMSIInstall()) {
       downgrade::MoveUserDataForFirstRunAfterDowngrade();
       base::FilePath user_data_dir;
       if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
         downgrade::UpdateLastVersion(user_data_dir);
     }
 #endif
   }
 
@@ skipping 292 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }