diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/proxy/polling_proxy_config_service.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/proxy/polling_proxy_config_service.cc')
| -rw-r--r-- | chromium/net/proxy/polling_proxy_config_service.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/net/proxy/polling_proxy_config_service.cc b/chromium/net/proxy/polling_proxy_config_service.cc index 4044e1b5904..ecec5cf18d5 100644 --- a/chromium/net/proxy/polling_proxy_config_service.cc +++ b/chromium/net/proxy/polling_proxy_config_service.cc @@ -4,13 +4,14 @@ #include "net/proxy/polling_proxy_config_service.h" +#include <memory> + #include "base/bind.h" #include "base/location.h" -#include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/threading/worker_pool.h" #include "net/proxy/proxy_config.h" |