Update from https://crrev.com/328418

base/threading/watchdog.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/watchdog.h"
 
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/platform_thread.h"
@@ skipping 151 matching lines @@
     // Ignore race of two alarms/breaks going off at roughly the same time.
     AutoLock static_lock(static_data->lock);
     // This was a real debugger break.
     static_data->last_debugged_alarm_time = last_alarm_time;
     static_data->last_debugged_alarm_delay = last_alarm_delay;
   }
 }
 
 void Watchdog::ThreadDelegate::SetThreadName() const {
   std::string name = watchdog_->thread_watched_name_ + " Watchdog";
-  PlatformThread::SetName(name.c_str());
+  PlatformThread::SetName(name);
   DVLOG(1) << "Watchdog active: " << name;
 }
 
 // static
 void Watchdog::ResetStaticData() {
   StaticData* static_data = g_static_data.Pointer();
   AutoLock lock(static_data->lock);
   static_data->last_debugged_alarm_time = TimeTicks();
   static_data->last_debugged_alarm_delay = TimeDelta();
 }
 
 }  // namespace base