| Index: chrome_elf/breakpad.cc
|
| diff --git a/chrome_elf/breakpad.cc b/chrome_elf/breakpad.cc
|
| index 25ca0db7e7a7635222c4588e9e69dfcaad39cf18..37b6608f2922cac840e1d49666e5e51d1f722665 100644
|
| --- a/chrome_elf/breakpad.cc
|
| +++ b/chrome_elf/breakpad.cc
|
| @@ -38,12 +38,13 @@ const wchar_t kSystemPrincipalSid[] = L"S-1-5-18";
|
| const wchar_t kNoErrorDialogs[] = L"noerrdialogs";
|
|
|
| google_breakpad::CustomClientInfo* GetCustomInfo() {
|
| - base::string16 process = IsNonBrowserProcess() ? L"renderer" : L"browser";
|
| + base::string16 process =
|
| + install_static::IsNonBrowserProcess() ? L"renderer" : L"browser";
|
|
|
| wchar_t exe_path[MAX_PATH] = {};
|
| base::string16 channel;
|
| if (GetModuleFileName(NULL, exe_path, arraysize(exe_path)) &&
|
| - IsCanary(exe_path)) {
|
| + install_static::IsCanary(exe_path)) {
|
| channel = L"canary";
|
| }
|
|
|
| @@ -146,20 +147,23 @@ void InitializeCrashReporting() {
|
| base::string16 pipe_name;
|
|
|
| bool enabled_by_policy = false;
|
| - bool use_policy = ReportingIsEnforcedByPolicy(&enabled_by_policy);
|
| + bool use_policy = install_static::ReportingIsEnforcedByPolicy(
|
| + &enabled_by_policy);
|
|
|
| if (!use_policy && IsHeadless()) {
|
| pipe_name = kChromePipeName;
|
| } else if (use_policy ?
|
| enabled_by_policy :
|
| - (is_official_chrome_build && AreUsageStatsEnabled(exe_path))) {
|
| + (is_official_chrome_build &&
|
| + install_static::AreUsageStatsEnabled())) {
|
| // Build the pipe name. It can be one of:
|
| // 32-bit system: \\.\pipe\GoogleCrashServices\S-1-5-18
|
| // 32-bit user: \\.\pipe\GoogleCrashServices\<user SID>
|
| // 64-bit system: \\.\pipe\GoogleCrashServices\S-1-5-18-x64
|
| // 64-bit user: \\.\pipe\GoogleCrashServices\<user SID>-x64
|
| - base::string16 user_sid = IsSystemInstall(exe_path) ? kSystemPrincipalSid :
|
| - GetUserSidString();
|
| + base::string16 user_sid =
|
| + install_static::IsSystemInstall(exe_path) ? kSystemPrincipalSid :
|
| + GetUserSidString();
|
| if (user_sid.empty())
|
| return;
|
|
|
|
|