commit f19b1020c82ddc31bc8702fa64166e6f6378c9d2
author James Robinson <jamesr@chromium.org> Tue May 05 18:12:15 2015 -0700
committer James Robinson <jamesr@chromium.org> Tue May 05 18:12:15 2015 -0700
tree b63b7a5ad715cc75312f7d66bcb3a3ddb459bdc7
parent 59689550d58a02d0e76145f51a3587d96b87b329

Update from https://crrev.com/328418

This includes the switch to libc++ on android.

Fixes outside of the rolled code:

*) ::TestSuite -> base::TestSuite
*) base::ScopedPtrHashMap's second parameter Value->scoped_ptr<Value>
*) re2 std::tr1 changes from upstream libc++ changes
*) tracked_objects:: api changes in mojo/common/task_tracker*

Review URL: https://codereview.chromium.org/1128733002

base/threading/platform_thread_android.cc

diff --git a/base/threading/platform_thread_android.cc b/base/threading/platform_thread_android.cc
index a31f659..11e5e2e 100644
--- a/base/threading/platform_thread_android.cc
+++ b/base/threading/platform_thread_android.cc
@@ -64,7 +64,7 @@
 
 }  // namespace internal
 
-void PlatformThread::SetName(const char* name) {
+void PlatformThread::SetName(const std::string& name) {
   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
   tracked_objects::ThreadData::InitializeThreadContext(name);
 
@@ -76,7 +76,7 @@
     return;
 
   // Set the name for the LWP (which gets truncated to 15 characters).
-  int err = prctl(PR_SET_NAME, name);
+  int err = prctl(PR_SET_NAME, name.c_str());
   if (err < 0 && errno != EPERM)
     DPLOG(ERROR) << "prctl(PR_SET_NAME)";
 }