Stability instrumentation Crashpad integration

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 54 matching lines @@
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <malloc.h>
 
 #include <algorithm>
 
 #include "base/debug/close_handle_hook_win.h"
 #include "chrome/browser/downgrade/user_data_downgrade.h"
 #include "chrome/child/v8_breakpad_support_win.h"
 #include "chrome/common/child_process_logging.h"
+#include "chrome/install_static/install_util.h"
 #include "sandbox/win/src/sandbox.h"
 #include "ui/base/resource/resource_bundle_win.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #include "chrome/app/chrome_main_mac.h"
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/mac/cfbundle_blocker.h"
@@ skipping 294 matching lines @@
 #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));
+
+    base::FilePath user_data_dir(install_static::GetUserDataDirectory());
+    // An empty user data directory means a failure (no fallback/default could
+    // be retrieved either).
+    CHECK(!user_data_dir.empty());
+    base::FilePath invalid_user_data_dir(
+        install_static::GetInvalidUserDataDirectory());
+    if (!invalid_user_data_dir.empty()) {
+      chrome::SetInvalidSpecifiedUserDataDir(invalid_user_data_dir);
       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.empty()) {
       if (user_data_dir.EndsWithSeparator())
@@ skipping 799 matching lines @@
 
 std::unique_ptr<service_manager::Service>
 ChromeMainDelegate::CreateEmbeddedService(const std::string& service_name) {
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   auto mash_service = CreateEmbeddedMashService(service_name);
   if (mash_service)
     return mash_service;
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   return nullptr;
 }