Fix base::GetNativeLibraryName() for Mac.

base/native_library_mac.mm

 // Copyright (c) 2011 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 "base/native_library.h"
 
 #include <dlfcn.h>
 #include <mach-o/getsect.h>
 
 #include "base/files/file_path.h"
@@ skipping 29 matching lines @@
 
 // static
 NativeLibrary LoadNativeLibrary(const FilePath& library_path,
                                 NativeLibraryLoadError* error) {
   // dlopen() etc. open the file off disk.
   if (library_path.Extension() == "dylib" || !DirectoryExists(library_path)) {
     void* dylib = dlopen(library_path.value().c_str(), RTLD_LAZY);
     if (!dylib) {
       if (error)
         error->message = dlerror();
-      return NULL;
+      return nullptr;
     }
     NativeLibrary native_lib = new NativeLibraryStruct();
     native_lib->type = DYNAMIC_LIB;
     native_lib->dylib = dylib;
     native_lib->objc_status = OBJC_UNKNOWN;
     return native_lib;
   }
   ScopedCFTypeRef<CFURLRef> url(CFURLCreateFromFileSystemRepresentation(
       kCFAllocatorDefault,
       (const UInt8*)library_path.value().c_str(),
       library_path.value().length(),
       true));
   if (!url)
-    return NULL;
+    return nullptr;
   CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url.get());
   if (!bundle)
-    return NULL;
+    return nullptr;
 
   NativeLibrary native_lib = new NativeLibraryStruct();
   native_lib->type = BUNDLE;
   native_lib->bundle = bundle;
   native_lib->bundle_resource_ref = CFBundleOpenBundleResourceMap(bundle);
   native_lib->objc_status = OBJC_UNKNOWN;
   return native_lib;
 }
 
 // static
@@ skipping 12 matching lines @@
     // Deliberately do not CFRelease the bundle or dlclose the dylib because
     // doing so can corrupt the ObjC runtime method caches. See
     // http://crbug.com/172319 for details.
   }
   delete library;
 }
 
 // static
 void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
                                           StringPiece name) {
-  void* function_pointer = NULL;
+  void* function_pointer = nullptr;
 
   // Get the function pointer using the right API for the type.
   if (library->type == BUNDLE) {
     ScopedCFTypeRef<CFStringRef> symbol_name(CFStringCreateWithCString(
         kCFAllocatorDefault, name.data(), kCFStringEncodingUTF8));
     function_pointer = CFBundleGetFunctionPointerForName(library->bundle,
                                                          symbol_name);
   } else {
     function_pointer = dlsym(library->dylib, name.data());
   }
 
   // If this library hasn't been tested for having ObjC, use the function
   // pointer to look up the section information for the library.
   if (function_pointer && library->objc_status == OBJC_UNKNOWN)
     library->objc_status = GetObjCStatusForImage(function_pointer);
 
   return function_pointer;
 }
 
 // static
-string16 GetNativeLibraryName(StringPiece16 name) {
-  return name.as_string() + ASCIIToUTF16(".dylib");
+std::string GetNativeLibraryName(StringPiece name) {
+  DCHECK(IsStringASCII(name));
+  return "lib" + name.as_string() + ".dylib";
 }
 
 }  // namespace base