BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

20 files changed, 6 insertions, 23 deletions

diff --git a/chromium/services/preferences/persistent_pref_store_impl.cc b/chromium/services/preferences/persistent_pref_store_impl.cc
index be50f89ac0f..7b5c0769140 100644
--- a/chromium/services/preferences/persistent_pref_store_impl.cc
+++ b/chromium/services/preferences/persistent_pref_store_impl.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/auto_reset.h"
-#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "components/prefs/persistent_pref_store.h"
diff --git a/chromium/services/preferences/persistent_pref_store_impl_unittest.cc b/chromium/services/preferences/persistent_pref_store_impl_unittest.cc
index cc91d4eb6f3..1291be4ca22 100644
--- a/chromium/services/preferences/persistent_pref_store_impl_unittest.cc
+++ b/chromium/services/preferences/persistent_pref_store_impl_unittest.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
diff --git a/chromium/services/preferences/pref_service_factory_unittest.cc b/chromium/services/preferences/pref_service_factory_unittest.cc
index 02a104318c7..78de917abc4 100644
--- a/chromium/services/preferences/pref_service_factory_unittest.cc
+++ b/chromium/services/preferences/pref_service_factory_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "base/barrier_closure.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/prefs/in_memory_pref_store.h"
diff --git a/chromium/services/preferences/pref_store_consistency_unittest.cc b/chromium/services/preferences/pref_store_consistency_unittest.cc
index c1e9df968da..2477151dce8 100644
--- a/chromium/services/preferences/pref_store_consistency_unittest.cc
+++ b/chromium/services/preferences/pref_store_consistency_unittest.cc
@@ -7,7 +7,6 @@
 
 #include "base/containers/circular_deque.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
diff --git a/chromium/services/preferences/pref_store_impl_unittest.cc b/chromium/services/preferences/pref_store_impl_unittest.cc
index 8a08015c005..60b2168d5a8 100644
--- a/chromium/services/preferences/pref_store_impl_unittest.cc
+++ b/chromium/services/preferences/pref_store_impl_unittest.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
diff --git a/chromium/services/preferences/public/cpp/dictionary_value_update.cc b/chromium/services/preferences/public/cpp/dictionary_value_update.cc
index bdc5a0738cb..04e9098d488 100644
--- a/chromium/services/preferences/public/cpp/dictionary_value_update.cc
+++ b/chromium/services/preferences/public/cpp/dictionary_value_update.cc
@@ -8,7 +8,6 @@
 #include <iterator>
 #include <utility>
 
-#include "base/memory/ptr_util.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 
diff --git a/chromium/services/preferences/public/cpp/in_process_service_factory.cc b/chromium/services/preferences/public/cpp/in_process_service_factory.cc
index 2a6eb051428..865d4c9977e 100644
--- a/chromium/services/preferences/public/cpp/in_process_service_factory.cc
+++ b/chromium/services/preferences/public/cpp/in_process_service_factory.cc
@@ -5,7 +5,6 @@
 #include "services/preferences/public/cpp/in_process_service_factory.h"
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "components/prefs/persistent_pref_store.h"
 #include "components/prefs/pref_registry.h"
 #include "services/preferences/public/cpp/pref_service_main.h"
diff --git a/chromium/services/preferences/public/cpp/lib/util.cc b/chromium/services/preferences/public/cpp/lib/util.cc
index 4168257cd58..8497843ce75 100644
--- a/chromium/services/preferences/public/cpp/lib/util.cc
+++ b/chromium/services/preferences/public/cpp/lib/util.cc
@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 
 namespace prefs {
diff --git a/chromium/services/preferences/public/cpp/scoped_pref_update.cc b/chromium/services/preferences/public/cpp/scoped_pref_update.cc
index 423415c05f9..c04940ec9a1 100644
--- a/chromium/services/preferences/public/cpp/scoped_pref_update.cc
+++ b/chromium/services/preferences/public/cpp/scoped_pref_update.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "components/prefs/pref_service.h"
 #include "services/preferences/public/cpp/dictionary_value_update.h"
 
diff --git a/chromium/services/preferences/public/mojom/BUILD.gn b/chromium/services/preferences/public/mojom/BUILD.gn
index 890e1fe265f..d512a9eb49e 100644
--- a/chromium/services/preferences/public/mojom/BUILD.gn
+++ b/chromium/services/preferences/public/mojom/BUILD.gn
@@ -11,5 +11,6 @@ mojom("mojom") {
   ]
   public_deps = [
     "//mojo/common:common_custom_types",
+    "//mojo/public/mojom/base",
   ]
 }
diff --git a/chromium/services/preferences/public/mojom/preferences.mojom b/chromium/services/preferences/public/mojom/preferences.mojom
index 194ce5fa062..66caa7d7b77 100644
--- a/chromium/services/preferences/public/mojom/preferences.mojom
+++ b/chromium/services/preferences/public/mojom/preferences.mojom
@@ -4,9 +4,9 @@
 
 module prefs.mojom;
 
-import "mojo/common/file_path.mojom";
-import "mojo/public/mojom/base/string16.mojom";
 import "mojo/common/values.mojom";
+import "mojo/public/mojom/base/file_path.mojom";
+import "mojo/public/mojom/base/string16.mojom";
 import "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom";
 
 const string kServiceName = "preferences";
@@ -176,8 +176,8 @@ struct PrefRegistration {
 // These parameters are passed to prefs::CreateTrackedPersistentPrefStore() in
 // services/preferences/persistent_pref_store_factory.cc.
 struct TrackedPersistentPrefStoreConfiguration {
-  mojo.common.mojom.FilePath unprotected_pref_filename;
-  mojo.common.mojom.FilePath protected_pref_filename;
+  mojo_base.mojom.FilePath unprotected_pref_filename;
+  mojo_base.mojom.FilePath protected_pref_filename;
   array<TrackedPreferenceMetadata> tracking_configuration;
   uint64 reporting_ids_count;
   string seed;
diff --git a/chromium/services/preferences/tracked/dictionary_hash_store_contents.cc b/chromium/services/preferences/tracked/dictionary_hash_store_contents.cc
index 669c4928a72..b4d5d066d1b 100644
--- a/chromium/services/preferences/tracked/dictionary_hash_store_contents.cc
+++ b/chromium/services/preferences/tracked/dictionary_hash_store_contents.cc
@@ -7,7 +7,6 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/persistent_pref_store.h"
diff --git a/chromium/services/preferences/tracked/interceptable_pref_filter_unittest.cc b/chromium/services/preferences/tracked/interceptable_pref_filter_unittest.cc
index e1452df6bca..a8bf7b8424f 100644
--- a/chromium/services/preferences/tracked/interceptable_pref_filter_unittest.cc
+++ b/chromium/services/preferences/tracked/interceptable_pref_filter_unittest.cc
@@ -8,7 +8,6 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chromium/services/preferences/tracked/pref_hash_calculator_unittest.cc b/chromium/services/preferences/tracked/pref_hash_calculator_unittest.cc
index c061dda1a08..d1921e23d55 100644
--- a/chromium/services/preferences/tracked/pref_hash_calculator_unittest.cc
+++ b/chromium/services/preferences/tracked/pref_hash_calculator_unittest.cc
@@ -9,7 +9,6 @@
 #include <utility>
 
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromium/services/preferences/tracked/pref_hash_filter.cc b/chromium/services/preferences/tracked/pref_hash_filter.cc
index 0bdd4b60c4a..594c319027c 100644
--- a/chromium/services/preferences/tracked/pref_hash_filter.cc
+++ b/chromium/services/preferences/tracked/pref_hash_filter.cc
@@ -11,7 +11,6 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
@@ -21,7 +20,6 @@
 #include "components/prefs/pref_store.h"
 #include "services/preferences/public/cpp/tracked/pref_names.h"
 #include "services/preferences/tracked/dictionary_hash_store_contents.h"
-#include "services/preferences/tracked/pref_hash_store.h"
 #include "services/preferences/tracked/pref_hash_store_transaction.h"
 #include "services/preferences/tracked/tracked_atomic_preference.h"
 #include "services/preferences/tracked/tracked_split_preference.h"
diff --git a/chromium/services/preferences/tracked/pref_hash_filter.h b/chromium/services/preferences/tracked/pref_hash_filter.h
index c425aee850d..2bad7bb5ce8 100644
--- a/chromium/services/preferences/tracked/pref_hash_filter.h
+++ b/chromium/services/preferences/tracked/pref_hash_filter.h
@@ -21,9 +21,9 @@
 #include "services/preferences/public/mojom/preferences.mojom.h"
 #include "services/preferences/tracked/hash_store_contents.h"
 #include "services/preferences/tracked/interceptable_pref_filter.h"
+#include "services/preferences/tracked/pref_hash_store.h"
 #include "services/preferences/tracked/tracked_preference.h"
 
-class PrefHashStore;
 class PrefService;
 
 namespace base {
diff --git a/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc b/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc
index f3912dd869e..af1ab1c8bd7 100644
--- a/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc
+++ b/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc
@@ -18,7 +18,6 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
diff --git a/chromium/services/preferences/tracked/registry_hash_store_contents_win_unittest.cc b/chromium/services/preferences/tracked/registry_hash_store_contents_win_unittest.cc
index dbb930155e8..b989071f769 100644
--- a/chromium/services/preferences/tracked/registry_hash_store_contents_win_unittest.cc
+++ b/chromium/services/preferences/tracked/registry_hash_store_contents_win_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
diff --git a/chromium/services/preferences/tracked/segregated_pref_store_unittest.cc b/chromium/services/preferences/tracked/segregated_pref_store_unittest.cc
index 5f611b3c867..61b76efeb01 100644
--- a/chromium/services/preferences/tracked/segregated_pref_store_unittest.cc
+++ b/chromium/services/preferences/tracked/segregated_pref_store_unittest.cc
@@ -11,7 +11,6 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
diff --git a/chromium/services/preferences/tracked/tracked_preferences_migration.cc b/chromium/services/preferences/tracked/tracked_preferences_migration.cc
index 928910df61d..9bce8035056 100644
--- a/chromium/services/preferences/tracked/tracked_preferences_migration.cc
+++ b/chromium/services/preferences/tracked/tracked_preferences_migration.cc
@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"