BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <[email protected]>

1 files changed, 6 insertions, 3 deletions

diff --git a/chromium/extensions/browser/extension_system.h b/chromium/extensions/browser/extension_system.h
index eb43586b944..c4a604a714e 100644
--- a/chromium/extensions/browser/extension_system.h
+++ b/chromium/extensions/browser/extension_system.h
@@ -40,7 +40,7 @@ class ManagementPolicy;
 class QuotaService;
 class RuntimeData;
 class ServiceWorkerManager;
-class SharedUserScriptMaster;
+class SharedUserScriptManager;
 class StateStore;
 class ValueStoreFactory;
 enum class UnloadedExtensionReason;
@@ -85,8 +85,8 @@ class ExtensionSystem : public KeyedService {
   // The ServiceWorkerManager is created at startup.
   virtual ServiceWorkerManager* service_worker_manager() = 0;
 
-  // The SharedUserScriptMaster is created at startup.
-  virtual SharedUserScriptMaster* shared_user_script_master() = 0;
+  // The SharedUserScriptManager is created at startup.
+  virtual SharedUserScriptManager* shared_user_script_manager() = 0;
 
   // The StateStore is created at startup.
   virtual StateStore* state_store() = 0;
@@ -127,6 +127,9 @@ class ExtensionSystem : public KeyedService {
   // Signaled when the extension system has completed its startup tasks.
   virtual const base::OneShotEvent& ready() const = 0;
 
+  // Whether the extension system is ready.
+  virtual bool is_ready() const = 0;
+
   // Returns the content verifier, if any.
   virtual ContentVerifier* content_verifier() = 0;