BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 18 insertions, 0 deletions

diff --git a/chromium/components/prefs/pref_service.h b/chromium/components/prefs/pref_service.h
index 2824a316a39..e77baccae7f 100644
--- a/chromium/components/prefs/pref_service.h
+++ b/chromium/components/prefs/pref_service.h
@@ -27,15 +27,23 @@
 #include "base/sequence_checker.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "components/prefs/persistent_pref_store.h"
 #include "components/prefs/pref_value_store.h"
 #include "components/prefs/prefs_export.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/scoped_java_ref.h"
+#endif
+
 class PrefNotifier;
 class PrefNotifierImpl;
 class PrefObserver;
 class PrefRegistry;
 class PrefStore;
+#if defined(OS_ANDROID)
+class PrefServiceAndroid;
+#endif
 
 namespace base {
 class FilePath;
@@ -370,6 +378,10 @@ class COMPONENTS_PREFS_EXPORT PrefService {
   void AddPrefObserverAllPrefs(PrefObserver* obs);
   void RemovePrefObserverAllPrefs(PrefObserver* obs);
 
+#if defined(OS_ANDROID)
+  base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
+#endif
+
  protected:
   // The PrefNotifier handles registering and notifying preference observers.
   // It is created and owned by this PrefService. Subclasses may access it for
@@ -462,6 +474,12 @@ class COMPONENTS_PREFS_EXPORT PrefService {
   // of registered preferences are.
   mutable PreferenceMap prefs_map_;
 
+#if defined(OS_ANDROID)
+  // Manage and fetch the java object that wraps this PrefService on
+  // android.
+  std::unique_ptr<PrefServiceAndroid> pref_service_android_;
+#endif
+
   SEQUENCE_CHECKER(sequence_checker_);
 
   DISALLOW_COPY_AND_ASSIGN(PrefService);