| Index: components/breakpad/app/breakpad_win.cc
|
| diff --git a/components/breakpad/app/breakpad_win.cc b/components/breakpad/app/breakpad_win.cc
|
| index 02daab6868bc55865673eaedb8d5efdac3942c82..f683ce40e7fbba41284fdd0a6a1caf091ec365cf 100644
|
| --- a/components/breakpad/app/breakpad_win.cc
|
| +++ b/components/breakpad/app/breakpad_win.cc
|
| @@ -266,9 +266,11 @@ google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
|
|
|
| // Common g_custom_entries.
|
| g_custom_entries->push_back(
|
| - google_breakpad::CustomInfoEntry(L"ver", UTF16ToWide(version).c_str()));
|
| + google_breakpad::CustomInfoEntry(L"ver",
|
| + base::UTF16ToWide(version).c_str()));
|
| g_custom_entries->push_back(
|
| - google_breakpad::CustomInfoEntry(L"prod", UTF16ToWide(product).c_str()));
|
| + google_breakpad::CustomInfoEntry(L"prod",
|
| + base::UTF16ToWide(product).c_str()));
|
| g_custom_entries->push_back(
|
| google_breakpad::CustomInfoEntry(L"plat", L"Win32"));
|
| g_custom_entries->push_back(
|
| @@ -286,7 +288,7 @@ google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
|
|
|
| if (!special_build.empty())
|
| g_custom_entries->push_back(google_breakpad::CustomInfoEntry(
|
| - L"special", UTF16ToWide(special_build).c_str()));
|
| + L"special", base::UTF16ToWide(special_build).c_str()));
|
|
|
| if (type == L"plugin" || type == L"ppapi") {
|
| std::wstring plugin_path =
|
| @@ -666,7 +668,7 @@ void InitCrashReporter(const std::string& process_type_switch) {
|
| // Disable the message box for assertions.
|
| _CrtSetReportMode(_CRT_ASSERT, 0);
|
|
|
| - std::wstring process_type = ASCIIToWide(process_type_switch);
|
| + std::wstring process_type = base::ASCIIToWide(process_type_switch);
|
| if (process_type.empty())
|
| process_type = L"browser";
|
|
|
| @@ -708,7 +710,7 @@ void InitCrashReporter(const std::string& process_type_switch) {
|
| InitDefaultCrashCallback(default_filter);
|
| return;
|
| }
|
| - std::wstring pipe_name = ASCIIToWide(pipe_name_ascii);
|
| + std::wstring pipe_name = base::ASCIIToWide(pipe_name_ascii);
|
|
|
| #ifdef _WIN64
|
| // The protocol for connecting to the out-of-process Breakpad crash
|
|
|