Update from https://crrev.com/328418

base/threading/thread_id_name_manager.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 "base/threading/thread_id_name_manager.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/logging.h"
@@ skipping 30 matching lines @@
 }
 
 void ThreadIdNameManager::RegisterThread(PlatformThreadHandle::Handle handle,
                                          PlatformThreadId id) {
   AutoLock locked(lock_);
   thread_id_to_handle_[id] = handle;
   thread_handle_to_interned_name_[handle] =
       name_to_interned_name_[kDefaultName];
 }
 
-void ThreadIdNameManager::SetName(PlatformThreadId id, const char* name) {
-  std::string str_name(name);
-
+void ThreadIdNameManager::SetName(PlatformThreadId id,
+                                  const std::string& name) {
   AutoLock locked(lock_);
-  NameToInternedNameMap::iterator iter = name_to_interned_name_.find(str_name);
+  NameToInternedNameMap::iterator iter = name_to_interned_name_.find(name);
   std::string* leaked_str = NULL;
   if (iter != name_to_interned_name_.end()) {
     leaked_str = iter->second;
   } else {
-    leaked_str = new std::string(str_name);
-    name_to_interned_name_[str_name] = leaked_str;
+    leaked_str = new std::string(name);
+    name_to_interned_name_[name] = leaked_str;
   }
 
   ThreadIdToHandleMap::iterator id_to_handle_iter =
       thread_id_to_handle_.find(id);
 
   // The main thread of a process will not be created as a Thread object which
   // means there is no PlatformThreadHandler registered.
   if (id_to_handle_iter == thread_id_to_handle_.end()) {
     main_process_name_ = leaked_str;
     main_process_id_ = id;
@@ skipping 32 matching lines @@
   DCHECK((id_to_handle_iter!= thread_id_to_handle_.end()));
   // The given |id| may have been re-used by the system. Make sure the
   // mapping points to the provided |handle| before removal.
   if (id_to_handle_iter->second != handle)
     return;
 
   thread_id_to_handle_.erase(id_to_handle_iter);
 }
 
 }  // namespace base