| Index: base/native_library_posix.cc
|
| diff --git a/base/native_library_posix.cc b/base/native_library_posix.cc
|
| index 0d5ab804235fed1067ade7371495a0e1cb30d249..2dc434b7be25af2395a80b313defa3e8be08616f 100644
|
| --- a/base/native_library_posix.cc
|
| +++ b/base/native_library_posix.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| +#include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/threading/thread_restrictions.h"
|
|
|
| @@ -50,8 +51,9 @@ void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
|
| }
|
|
|
| // static
|
| -string16 GetNativeLibraryName(StringPiece16 name) {
|
| - return ASCIIToUTF16("lib") + name.as_string() + ASCIIToUTF16(".so");
|
| +std::string GetNativeLibraryName(StringPiece name) {
|
| + DCHECK(IsStringASCII(name));
|
| + return "lib" + name.as_string() + ".so";
|
| }
|
|
|
| } // namespace base
|
|
|