| Index: remoting/host/plugin/host_script_object.cc
|
| diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
|
| index 288b2402bd100f2a4d04ff5c631246ce764e4a37..456ca50cd9f5761f209aa516427cd276518955a2 100644
|
| --- a/remoting/host/plugin/host_script_object.cc
|
| +++ b/remoting/host/plugin/host_script_object.cc
|
| @@ -939,7 +939,7 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) {
|
| #if !defined(OS_WIN)
|
| base::string16 ui_locale;
|
| LocalizeString(localize_func, "@@ui_locale", &ui_locale);
|
| - remoting::LoadResources(UTF16ToUTF8(ui_locale));
|
| + remoting::LoadResources(base::UTF16ToUTF8(ui_locale));
|
| #endif // !defined(OS_WIN)
|
| }
|
|
|
| @@ -973,7 +973,7 @@ bool HostNPScriptObject::LocalizeStringWithSubstitution(
|
| LOG(ERROR) << "Missing translation for " << tag;
|
| return false;
|
| }
|
| - *result = UTF8ToUTF16(translation);
|
| + *result = base::UTF8ToUTF16(translation);
|
| return true;
|
| }
|
|
|
|
|