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>

9 files changed, 45 insertions, 36 deletions

diff --git a/chromium/components/wifi/BUILD.gn b/chromium/components/wifi/BUILD.gn
index e1e73fc682d..7cd31469401 100644
--- a/chromium/components/wifi/BUILD.gn
+++ b/chromium/components/wifi/BUILD.gn
@@ -29,6 +29,7 @@ component("wifi") {
   if (is_mac) {
     libs = [
       "CoreWLAN.framework",
+      "Foundation.framework",
       "SystemConfiguration.framework",
     ]
   }
@@ -56,6 +57,7 @@ executable("wifi_test") {
     ":wifi",
     "//base",
     "//build/config/sanitizers:deps",
+    "//build/win:default_exe_manifest",
     "//components/onc",
   ]
 }
diff --git a/chromium/components/wifi/fake_wifi_service.cc b/chromium/components/wifi/fake_wifi_service.cc
index 19e63ee6ef1..bbf3f8e4f01 100644
--- a/chromium/components/wifi/fake_wifi_service.cc
+++ b/chromium/components/wifi/fake_wifi_service.cc
@@ -4,6 +4,8 @@
 
 #include "components/wifi/fake_wifi_service.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "components/onc/onc_constants.h"
@@ -82,7 +84,7 @@ void FakeWiFiService::GetState(const std::string& network_guid,
 
 void FakeWiFiService::SetProperties(
     const std::string& network_guid,
-    scoped_ptr<base::DictionaryValue> properties,
+    std::unique_ptr<base::DictionaryValue> properties,
     std::string* error) {
   NetworkList::iterator network_properties = FindNetwork(network_guid);
   if (network_properties == networks_.end() ||
@@ -93,7 +95,7 @@ void FakeWiFiService::SetProperties(
 
 void FakeWiFiService::CreateNetwork(
     bool shared,
-    scoped_ptr<base::DictionaryValue> properties,
+    std::unique_ptr<base::DictionaryValue> properties,
     std::string* network_guid,
     std::string* error) {
   NetworkProperties network_properties;
@@ -114,7 +116,8 @@ void FakeWiFiService::GetVisibleNetworks(const std::string& network_type,
        ++it) {
     if (network_type.empty() || network_type == onc::network_type::kAllTypes ||
         it->type == network_type) {
-      scoped_ptr<base::DictionaryValue> network(it->ToValue(!include_details));
+      std::unique_ptr<base::DictionaryValue> network(
+          it->ToValue(!include_details));
       network_list->Append(network.release());
     }
   }
diff --git a/chromium/components/wifi/fake_wifi_service.h b/chromium/components/wifi/fake_wifi_service.h
index bb5c7574795..551a8b47878 100644
--- a/chromium/components/wifi/fake_wifi_service.h
+++ b/chromium/components/wifi/fake_wifi_service.h
@@ -34,10 +34,10 @@ class FakeWiFiService : public WiFiService {
                 base::DictionaryValue* properties,
                 std::string* error) override;
   void SetProperties(const std::string& network_guid,
-                     scoped_ptr<base::DictionaryValue> properties,
+                     std::unique_ptr<base::DictionaryValue> properties,
                      std::string* error) override;
   void CreateNetwork(bool shared,
-                     scoped_ptr<base::DictionaryValue> properties,
+                     std::unique_ptr<base::DictionaryValue> properties,
                      std::string* network_guid,
                      std::string* error) override;
   void GetVisibleNetworks(const std::string& network_type,
diff --git a/chromium/components/wifi/network_properties.cc b/chromium/components/wifi/network_properties.cc
index 58b09b9d0f8..e8991259e3a 100644
--- a/chromium/components/wifi/network_properties.cc
+++ b/chromium/components/wifi/network_properties.cc
@@ -24,9 +24,9 @@ NetworkProperties::NetworkProperties(const NetworkProperties& other) = default;
 NetworkProperties::~NetworkProperties() {
 }
 
-scoped_ptr<base::DictionaryValue> NetworkProperties::ToValue(
+std::unique_ptr<base::DictionaryValue> NetworkProperties::ToValue(
     bool network_list) const {
-  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
+  std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
 
   value->SetString(onc::network_config::kGUID, guid);
   value->SetString(onc::network_config::kName, name);
@@ -37,7 +37,7 @@ scoped_ptr<base::DictionaryValue> NetworkProperties::ToValue(
   // For now, assume all WiFi services are connectable.
   value->SetBoolean(onc::network_config::kConnectable, true);
 
-  scoped_ptr<base::DictionaryValue> wifi(new base::DictionaryValue());
+  std::unique_ptr<base::DictionaryValue> wifi(new base::DictionaryValue());
   wifi->SetString(onc::wifi::kSecurity, security);
   wifi->SetInteger(onc::wifi::kSignalStrength, signal_strength);
 
@@ -45,7 +45,7 @@ scoped_ptr<base::DictionaryValue> NetworkProperties::ToValue(
   if (!network_list) {
     if (frequency != kFrequencyUnknown)
       wifi->SetInteger(onc::wifi::kFrequency, frequency);
-    scoped_ptr<base::ListValue> frequency_list(new base::ListValue());
+    std::unique_ptr<base::ListValue> frequency_list(new base::ListValue());
     for (FrequencySet::const_iterator it = this->frequency_set.begin();
          it != this->frequency_set.end();
          ++it) {
diff --git a/chromium/components/wifi/network_properties.h b/chromium/components/wifi/network_properties.h
index 734137b33e4..07bfe1dc1f6 100644
--- a/chromium/components/wifi/network_properties.h
+++ b/chromium/components/wifi/network_properties.h
@@ -8,10 +8,10 @@
 #include <stdint.h>
 
 #include <list>
+#include <memory>
 #include <set>
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "components/wifi/wifi_export.h"
 
@@ -52,7 +52,7 @@ struct WIFI_EXPORT NetworkProperties {
   Frequency frequency;
   FrequencySet frequency_set;
 
-  scoped_ptr<base::DictionaryValue> ToValue(bool network_list) const;
+  std::unique_ptr<base::DictionaryValue> ToValue(bool network_list) const;
   // Updates only properties set in |value|.
   bool UpdateFromValue(const base::DictionaryValue& value);
   static std::string MacAddressAsString(const uint8_t mac_as_int[6]);
diff --git a/chromium/components/wifi/wifi_service.h b/chromium/components/wifi/wifi_service.h
index 47d2def3db9..802e4457b63 100644
--- a/chromium/components/wifi/wifi_service.h
+++ b/chromium/components/wifi/wifi_service.h
@@ -6,6 +6,7 @@
 #define COMPONENTS_WIFI_WIFI_SERVICE_H_
 
 #include <list>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -13,7 +14,6 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "components/wifi/wifi_export.h"
@@ -69,7 +69,7 @@ class WIFI_EXPORT WiFiService {
   // Set Properties of network identified by |network_guid|. Populates |error|
   // on failure.
   virtual void SetProperties(const std::string& network_guid,
-                             scoped_ptr<base::DictionaryValue> properties,
+                             std::unique_ptr<base::DictionaryValue> properties,
                              std::string* error) = 0;
 
   // Creates a new network configuration from |properties|. If |shared| is true,
@@ -77,7 +77,7 @@ class WIFI_EXPORT WiFiService {
   // network already exists, this will fail and populate |error|. On success
   // populates the |network_guid| of the new network.
   virtual void CreateNetwork(bool shared,
-                             scoped_ptr<base::DictionaryValue> properties,
+                             std::unique_ptr<base::DictionaryValue> properties,
                              std::string* network_guid,
                              std::string* error) = 0;
 
diff --git a/chromium/components/wifi/wifi_service_mac.mm b/chromium/components/wifi/wifi_service_mac.mm
index ea2961c4e77..17ee60cf6d8 100644
--- a/chromium/components/wifi/wifi_service_mac.mm
+++ b/chromium/components/wifi/wifi_service_mac.mm
@@ -47,11 +47,11 @@ class WiFiServiceMac : public WiFiService {
                 std::string* error) override;
 
   void SetProperties(const std::string& network_guid,
-                     scoped_ptr<base::DictionaryValue> properties,
+                     std::unique_ptr<base::DictionaryValue> properties,
                      std::string* error) override;
 
   void CreateNetwork(bool shared,
-                     scoped_ptr<base::DictionaryValue> properties,
+                     std::unique_ptr<base::DictionaryValue> properties,
                      std::string* network_guid,
                      std::string* error) override;
 
@@ -192,7 +192,7 @@ void WiFiServiceMac::GetProperties(const std::string& network_guid,
   }
 
   it->connection_state = GetNetworkConnectionState(network_guid);
-  scoped_ptr<base::DictionaryValue> network(it->ToValue(false));
+  std::unique_ptr<base::DictionaryValue> network(it->ToValue(false));
   properties->Swap(network.get());
   DVLOG(1) << *properties;
 }
@@ -212,7 +212,7 @@ void WiFiServiceMac::GetState(const std::string& network_guid,
 
 void WiFiServiceMac::SetProperties(
     const std::string& network_guid,
-    scoped_ptr<base::DictionaryValue> properties,
+    std::unique_ptr<base::DictionaryValue> properties,
     std::string* error) {
   base::DictionaryValue* existing_properties;
   // If the network properties already exist, don't override previously set
@@ -228,7 +228,7 @@ void WiFiServiceMac::SetProperties(
 
 void WiFiServiceMac::CreateNetwork(
     bool shared,
-    scoped_ptr<base::DictionaryValue> properties,
+    std::unique_ptr<base::DictionaryValue> properties,
     std::string* network_guid,
     std::string* error) {
   NetworkProperties network_properties;
@@ -262,7 +262,8 @@ void WiFiServiceMac::GetVisibleNetworks(const std::string& network_type,
   for (NetworkList::const_iterator it = networks_.begin();
        it != networks_.end();
        ++it) {
-    scoped_ptr<base::DictionaryValue> network(it->ToValue(!include_details));
+    std::unique_ptr<base::DictionaryValue> network(
+        it->ToValue(!include_details));
     network_list->Append(network.release());
   }
 }
diff --git a/chromium/components/wifi/wifi_service_win.cc b/chromium/components/wifi/wifi_service_win.cc
index e4edf6af5a0..1d5e1617e04 100644
--- a/chromium/components/wifi/wifi_service_win.cc
+++ b/chromium/components/wifi/wifi_service_win.cc
@@ -198,11 +198,11 @@ class WiFiServiceImpl : public WiFiService {
                 std::string* error) override;
 
   void SetProperties(const std::string& network_guid,
-                     scoped_ptr<base::DictionaryValue> properties,
+                     std::unique_ptr<base::DictionaryValue> properties,
                      std::string* error) override;
 
   void CreateNetwork(bool shared,
-                     scoped_ptr<base::DictionaryValue> properties,
+                     std::unique_ptr<base::DictionaryValue> properties,
                      std::string* network_guid,
                      std::string* error) override;
 
@@ -384,7 +384,7 @@ class WiFiServiceImpl : public WiFiService {
   // given |frequency|.
   DWORD GetDesiredBssList(DOT11_SSID& ssid,
                           Frequency frequency,
-                          scoped_ptr<DOT11_BSSID_LIST>* desired_list);
+                          std::unique_ptr<DOT11_BSSID_LIST>* desired_list);
 
   // Normalizes |frequency_in_mhz| into one of |Frequency| values.
   Frequency GetNormalizedFrequency(int frequency_in_mhz) const;
@@ -467,7 +467,7 @@ class WiFiServiceImpl : public WiFiService {
   // Observer to get notified when network list has changed (scan complete).
   NetworkGuidListCallback network_list_changed_observer_;
   // Saved value of network location wizard show value.
-  scoped_ptr<DWORD> saved_nw_category_wizard_;
+  std::unique_ptr<DWORD> saved_nw_category_wizard_;
   // Task runner to post events on UI thread.
   scoped_refptr<base::SingleThreadTaskRunner> event_task_runner_;
   // Task runner for worker tasks.
@@ -562,7 +562,7 @@ void WiFiServiceImpl::GetState(const std::string& network_guid,
 
 void WiFiServiceImpl::SetProperties(
     const std::string& network_guid,
-    scoped_ptr<base::DictionaryValue> properties,
+    std::unique_ptr<base::DictionaryValue> properties,
     std::string* error) {
   // Temporary preserve WiFi properties (desired frequency, wifi password) to
   // use in StartConnect.
@@ -587,7 +587,7 @@ void WiFiServiceImpl::SetProperties(
 
 void WiFiServiceImpl::CreateNetwork(
     bool shared,
-    scoped_ptr<base::DictionaryValue> properties,
+    std::unique_ptr<base::DictionaryValue> properties,
     std::string* network_guid,
     std::string* error) {
   DWORD error_code = EnsureInitialized();
@@ -625,7 +625,8 @@ void WiFiServiceImpl::CreateNetwork(
   }
 
   if (tkip_profile_xml != profile_xml) {
-    scoped_ptr<base::DictionaryValue> tkip_profile(new base::DictionaryValue());
+    std::unique_ptr<base::DictionaryValue> tkip_profile(
+        new base::DictionaryValue());
     tkip_profile->SetString(kProfileXmlKey, tkip_profile_xml);
     tkip_profile->SetBoolean(kProfileSharedKey, shared);
     created_profiles_.SetWithoutPathExpansion(network_properties.guid,
@@ -653,7 +654,7 @@ void WiFiServiceImpl::GetVisibleNetworks(const std::string& network_type,
       for (NetworkList::const_iterator it = networks.begin();
            it != networks.end();
            ++it) {
-        scoped_ptr<base::DictionaryValue> network(
+        std::unique_ptr<base::DictionaryValue> network(
             it->ToValue(!include_details));
         network_list->Append(network.release());
       }
@@ -1150,7 +1151,7 @@ DWORD WiFiServiceImpl::FindAdapterIndexMapByGUID(
   ULONG buffer_length = 0;
   DWORD error = ::GetInterfaceInfo(NULL, &buffer_length);
   if (error == ERROR_INSUFFICIENT_BUFFER) {
-    scoped_ptr<unsigned char[]> buffer(new unsigned char[buffer_length]);
+    std::unique_ptr<unsigned char[]> buffer(new unsigned char[buffer_length]);
     IP_INTERFACE_INFO* interface_info =
         reinterpret_cast<IP_INTERFACE_INFO*>(buffer.get());
     error = GetInterfaceInfo(interface_info, &buffer_length);
@@ -1535,7 +1536,7 @@ Frequency WiFiServiceImpl::GetFrequencyToConnect(
 DWORD WiFiServiceImpl::GetDesiredBssList(
     DOT11_SSID& ssid,
     Frequency frequency,
-    scoped_ptr<DOT11_BSSID_LIST>* desired_list) {
+    std::unique_ptr<DOT11_BSSID_LIST>* desired_list) {
   if (client_ == NULL) {
     NOTREACHED();
     return ERROR_NOINTERFACE;
@@ -1588,7 +1589,7 @@ DWORD WiFiServiceImpl::GetDesiredBssList(
     // If any matching BSS were found, prepare the header.
     if (best_quality > 0) {
       const WLAN_BSS_ENTRY& bss_entry(bss_list->wlanBssEntries[best_index]);
-      scoped_ptr<DOT11_BSSID_LIST> selected_list(new DOT11_BSSID_LIST);
+      std::unique_ptr<DOT11_BSSID_LIST> selected_list(new DOT11_BSSID_LIST);
 
       selected_list->Header.Revision = DOT11_BSSID_LIST_REVISION_1;
       selected_list->Header.Size = sizeof(DOT11_BSSID_LIST);
@@ -1630,7 +1631,7 @@ DWORD WiFiServiceImpl::Connect(const std::string& network_guid,
 
   DWORD error = ERROR_SUCCESS;
   DOT11_SSID ssid = SSIDFromGUID(network_guid);
-  scoped_ptr<DOT11_BSSID_LIST> desired_bss_list;
+  std::unique_ptr<DOT11_BSSID_LIST> desired_bss_list;
   error = GetDesiredBssList(ssid, frequency, &desired_bss_list);
   if (error == ERROR_SUCCESS) {
     if (HaveProfile(network_guid)) {
@@ -1647,7 +1648,8 @@ DWORD WiFiServiceImpl::Connect(const std::string& network_guid,
     } else {
       // If network is available, but is not open security, then it cannot be
       // connected without profile, so return 'access denied' error.
-      scoped_ptr<base::DictionaryValue> properties (new base::DictionaryValue);
+      std::unique_ptr<base::DictionaryValue> properties(
+          new base::DictionaryValue);
       const base::DictionaryValue* wifi;
       std::string wifi_security;
       std::string error_string;
diff --git a/chromium/components/wifi/wifi_test.cc b/chromium/components/wifi/wifi_test.cc
index 30014affea0..b2d1def8751 100644
--- a/chromium/components/wifi/wifi_test.cc
+++ b/chromium/components/wifi/wifi_test.cc
@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 
+#include <memory>
 #include <string>
 #include <utility>
 
@@ -13,7 +14,6 @@
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -75,7 +75,7 @@ class WiFiTest {
   base::mac::ScopedNSAutoreleasePool scoped_pool_;
 #endif
 
-  scoped_ptr<WiFiService> wifi_service_;
+  std::unique_ptr<WiFiService> wifi_service_;
 
   // Need AtExitManager to support AsWeakPtr (in NetLog).
   base::AtExitManager exit_manager_;
@@ -157,7 +157,8 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) {
   }
 
   // Optional properties (frequency, password) to use for connect or create.
-  scoped_ptr<base::DictionaryValue> properties(new base::DictionaryValue());
+  std::unique_ptr<base::DictionaryValue> properties(
+      new base::DictionaryValue());
 
   if (!frequency.empty()) {
     int value = 0;