BASELINE: Update Chromium to 65.0.3525.40

Also imports missing submodules

Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 10 insertions, 14 deletions

diff --git a/chromium/components/subresource_filter/core/browser/ruleset_service_unittest.cc b/chromium/components/subresource_filter/core/browser/ruleset_service_unittest.cc
index 56444462517..bc35d4d7c0b 100644
--- a/chromium/components/subresource_filter/core/browser/ruleset_service_unittest.cc
+++ b/chromium/components/subresource_filter/core/browser/ruleset_service_unittest.cc
@@ -17,7 +17,6 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -70,7 +69,7 @@ template <typename Fun>
 std::unique_ptr<ScopedFunctionOverride<Fun>> OverrideFunctionForScope(
     Fun* target,
     Fun replacement) {
-  return base::MakeUnique<ScopedFunctionOverride<Fun>>(target, replacement);
+  return std::make_unique<ScopedFunctionOverride<Fun>>(target, replacement);
 }
 
 std::vector<uint8_t> ReadFileContents(base::File* file) {
@@ -172,8 +171,8 @@ class SubresourceFilteringRulesetServiceTest : public ::testing::Test {
   }
 
   void ResetRulesetService() {
-    mock_delegate_ = base::MakeUnique<MockRulesetServiceDelegate>();
-    service_ = base::MakeUnique<RulesetService>(
+    mock_delegate_ = std::make_unique<MockRulesetServiceDelegate>();
+    service_ = std::make_unique<RulesetService>(
         &pref_service_, task_runner_, mock_delegate_.get(), base_dir());
   }
 
diff --git a/chromium/components/subresource_filter/core/browser/subresource_filter_features.cc b/chromium/components/subresource_filter/core/browser/subresource_filter_features.cc
index 955e759a0bb..01b845f8023 100644
--- a/chromium/components/subresource_filter/core/browser/subresource_filter_features.cc
+++ b/chromium/components/subresource_filter/core/browser/subresource_filter_features.cc
@@ -12,7 +12,6 @@
 #include <utility>
 
 #include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ -347,7 +346,7 @@ bool Configuration::operator!=(const Configuration& rhs) const {
 
 std::unique_ptr<base::trace_event::TracedValue>
 Configuration::ActivationConditions::ToTracedValue() const {
-  auto value = base::MakeUnique<base::trace_event::TracedValue>();
+  auto value = std::make_unique<base::trace_event::TracedValue>();
   value->SetString("activation_scope", StreamToString(activation_scope));
   value->SetString("activation_list", StreamToString(activation_list));
   value->SetInteger("priority", priority);
@@ -357,7 +356,7 @@ Configuration::ActivationConditions::ToTracedValue() const {
 
 std::unique_ptr<base::trace_event::TracedValue> Configuration::ToTracedValue()
     const {
-  auto value = base::MakeUnique<base::trace_event::TracedValue>();
+  auto value = std::make_unique<base::trace_event::TracedValue>();
   auto traced_conditions = activation_conditions.ToTracedValue();
   value->SetValue("activation_conditions", *traced_conditions);
   value->SetString("activation_level",
diff --git a/chromium/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc b/chromium/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc
index f14bc212dad..59352bcc60c 100644
--- a/chromium/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc
+++ b/chromium/components/subresource_filter/core/browser/subresource_filter_features_test_support.cc
@@ -8,7 +8,6 @@
 #include <utility>
 
 #include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event_argument.h"
@@ -81,7 +80,7 @@ void ScopedSubresourceFilterFeatureToggle::ResetSubresourceFilterState(
   }
 
   scoped_configuration_.ResetConfiguration();
-  scoped_feature_list_ = base::MakeUnique<base::test::ScopedFeatureList>();
+  scoped_feature_list_ = std::make_unique<base::test::ScopedFeatureList>();
   scoped_feature_list_->InitFromCommandLine(enabled_features,
                                             disabled_features);
 }
diff --git a/chromium/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc b/chromium/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc
index eab8df584bb..1871ef444a4 100644
--- a/chromium/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc
+++ b/chromium/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc
@@ -40,7 +40,7 @@ class ScopedExperimentalStateToggle {
         kTestFieldTrialName, kTestExperimentGroupName);
 
     std::unique_ptr<base::FeatureList> feature_list =
-        base::MakeUnique<base::FeatureList>();
+        std::make_unique<base::FeatureList>();
     feature_list->RegisterFieldTrialOverride(
         kSafeBrowsingSubresourceFilter.name, feature_state, field_trial);
     scoped_feature_list_.InitWithFeatureList(std::move(feature_list));
diff --git a/chromium/components/subresource_filter/core/common/activation_state.cc b/chromium/components/subresource_filter/core/common/activation_state.cc
index 7daec3d82fc..cc651e8121a 100644
--- a/chromium/components/subresource_filter/core/common/activation_state.cc
+++ b/chromium/components/subresource_filter/core/common/activation_state.cc
@@ -8,14 +8,13 @@
 #include <sstream>
 #include <string>
 
-#include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event_argument.h"
 
 namespace subresource_filter {
 
 std::unique_ptr<base::trace_event::TracedValue> ActivationState::ToTracedValue()
     const {
-  auto value = base::MakeUnique<base::trace_event::TracedValue>();
+  auto value = std::make_unique<base::trace_event::TracedValue>();
   std::ostringstream level;
   level << activation_level;
   value->SetString("activation_level", level.str());
diff --git a/chromium/components/subresource_filter/core/common/test_ruleset_creator.cc b/chromium/components/subresource_filter/core/common/test_ruleset_creator.cc
index f6c22260464..392fdc27e16 100644
--- a/chromium/components/subresource_filter/core/common/test_ruleset_creator.cc
+++ b/chromium/components/subresource_filter/core/common/test_ruleset_creator.cc
@@ -4,11 +4,11 @@
 
 #include "components/subresource_filter/core/common/test_ruleset_creator.h"
 
+#include <memory>
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/subresource_filter/core/common/indexed_ruleset.h"
@@ -112,7 +112,7 @@ TestRulesetPair::~TestRulesetPair() = default;
 // TestRulesetCreator ----------------------------------------------------------
 
 TestRulesetCreator::TestRulesetCreator()
-    : scoped_temp_dir_(base::MakeUnique<base::ScopedTempDir>()) {}
+    : scoped_temp_dir_(std::make_unique<base::ScopedTempDir>()) {}
 
 TestRulesetCreator::~TestRulesetCreator() {
   base::ScopedAllowBlockingForTesting allow_blocking;