Fix some clang tool compile errors after upstream 777180a32b6107

TBR=hans

Bug: none
Change-Id: Icf7e780f1033e58dab17ae352eb50c9cd47390bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026473Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736318}

tools/clang/translation_unit/TranslationUnitGenerator.cpp

@@ -130,9 +130,9 @@ void IncludeFinderPPCallbacks::FileChanged(
     if (!last_inclusion_directive_.empty()) {
       current_files_.push(last_inclusion_directive_);
     } else {
-      current_files_.push(
+      current_files_.push(std::string(
           source_manager_->getFileEntryForID(source_manager_->getMainFileID())
-              ->getName());
+              ->getName()));
     }
   } else if (reason == ExitFile) {
     current_files_.pop();
@@ -225,7 +225,7 @@ void IncludeFinderPPCallbacks::EndOfMainFile() {
   assert(!real_path(main_file->getName(), main_file_name_real_path));
   assert(main_source_file_real_path == main_file_name_real_path);
 
-  AddFile(main_file->getName());
+  AddFile(std::string(main_file->getName()));
 }
 
 class CompilationIndexerAction : public clang::PreprocessorFrontendAction {
@@ -250,7 +250,7 @@ class CompilationIndexerAction : public clang::PreprocessorFrontendAction {
 void CompilationIndexerAction::ExecuteAction() {
   auto inputs = getCompilerInstance().getFrontendOpts().Inputs;
   assert(inputs.size() == 1);
-  main_source_file_ = inputs[0].getFile();
+  main_source_file_ = std::string(inputs[0].getFile());
 
   Preprocess();
 }