Fix base::GetNativeLibraryName() for Mac.

net/udp/udp_socket_posix.cc

 // Copyright (c) 2012 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 "net/udp/udp_socket_posix.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <net/if.h>
 #include <netdb.h>
@@ skipping 334 matching lines @@
   }
   // NOTE(pauljensen): This does rely on Android implementation details, but
   // these details are unlikely to change.
   typedef int (*SetNetworkForSocket)(unsigned netId, int socketFd);
   static SetNetworkForSocket setNetworkForSocket;
   // This is racy, but all racers should come out with the same answer so it
   // shouldn't matter.
   if (setNetworkForSocket == nullptr) {
     // Android's netd client library should always be loaded in our address
     // space as it shims libc functions like connect().
-    base::FilePath file(base::FilePath::FromUTF16Unsafe(
-        base::GetNativeLibraryName(base::ASCIIToUTF16("netd_client"))));
+    base::FilePath file(base::FilePath::FromUTF8Unsafe(

[Mark Mentovai, 2016/06/13 19:29:03]

Is FromUTF8Unsafe() even needed in this Android-only block?

[Lei Zhang, 2016/06/13 21:30:34]

Nope.

+        base::GetNativeLibraryName("netd_client")));
     base::NativeLibrary lib = base::LoadNativeLibrary(file, nullptr);
     setNetworkForSocket = reinterpret_cast<SetNetworkForSocket>(
         base::GetFunctionPointerFromNativeLibrary(lib, "setNetworkForSocket"));
   }
   if (setNetworkForSocket == nullptr)
     return ERR_NOT_IMPLEMENTED;
   int rv = setNetworkForSocket(network, socket_);
   // If |network| has since disconnected, |rv| will be ENONET.  Surface this as
   // ERR_NETWORK_CHANGED, rather than MapSystemError(ENONET) which gives back
   // the less descriptive ERR_FAILED.
@@ skipping 440 matching lines @@
     return MapSystemError(errno);
 
   return OK;
 }
 
 void UDPSocketPosix::DetachFromThread() {
   base::NonThreadSafe::DetachFromThread();
 }
 
 }  // namespace net