Breakpad Linux: Prevent some memory leaks. (Try 2)

components/breakpad/browser/crash_handler_host_linux.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_BREAKPAD_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
 #define COMPONENTS_BREAKPAD_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
 
 #include <sys/types.h>
 
 #include <string>
@@ skipping 43 matching lines @@
 
   // MessageLoop::DestructionObserver impl:
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
   // Whether we are shutting down or not.
   bool IsShuttingDown() const;
 
  private:
   void Init();
 
-  // Do work on the FILE thread for OnFileCanReadWithoutBlocking().
-  void WriteDumpFile(BreakpadInfo* info,
+  // Do work in a sequenced worker pool for OnFileCanReadWithoutBlocking().
+  void WriteDumpFile(scoped_ptr<BreakpadInfo> info,
+                     scoped_ptr<char[]> crash_context,
                      pid_t crashing_pid,
-                     char* crash_context,
                      int signal_fd);
 
   // Continue OnFileCanReadWithoutBlocking()'s work on the IO thread.
-  void QueueCrashDumpTask(BreakpadInfo* info, int signal_fd);
+  void QueueCrashDumpTask(scoped_ptr<BreakpadInfo> info, int signal_fd);
 
   std::string process_type_;
   base::FilePath dumps_path_;
   bool upload_;
 
   int process_socket_;
   int browser_socket_;
 
   base::MessageLoopForIO::FileDescriptorWatcher file_descriptor_watcher_;
   scoped_ptr<base::Thread> uploader_thread_;
   bool shutting_down_;
 
   // Unique sequence token so that writing crash dump won't be blocked
   // by other tasks.
   base::SequencedWorkerPool::SequenceToken worker_pool_token_;
 
-#if defined(ADDRESS_SANITIZER)
-  char* asan_report_str_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(CrashHandlerHostLinux);
 };
 
 }  // namespace breakpad
 
 #endif  // COMPONENTS_BREAKPAD_BROWSER_CRASH_HANDLER_HOST_LINUX_H_