diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/base/linux_util.cc | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/base/linux_util.cc')
| -rw-r--r-- | chromium/base/linux_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/base/linux_util.cc b/chromium/base/linux_util.cc index 744a2311fe6..74ac98f7703 100644 --- a/chromium/base/linux_util.cc +++ b/chromium/base/linux_util.cc @@ -13,11 +13,11 @@ #include <sys/types.h> #include <unistd.h> +#include <memory> #include <vector> #include "base/command_line.h" #include "base/files/file_util.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/process/launch.h" #include "base/strings/string_util.h" @@ -155,7 +155,7 @@ pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, } closedir(task); - scoped_ptr<char[]> syscall_data(new char[expected_data.length()]); + std::unique_ptr<char[]> syscall_data(new char[expected_data.length()]); for (std::vector<pid_t>::const_iterator i = tids.begin(); i != tids.end(); ++i) { const pid_t current_tid = *i; |