chore: bump chromium to 63be48daea281d4f8c834c2e707a7 (master) (#19923)

patches/chromium/tts.patch

@@ -10,7 +10,7 @@ Subject: tts.patch
   destruction from content layer.
 
 diff --git a/chrome/browser/speech/tts_controller_delegate_impl.cc b/chrome/browser/speech/tts_controller_delegate_impl.cc
-index e96b0cef21bec8925d4adf1e8692dc00f5ec6f5f..7ec07534aa3628873c9fe784fa0235f3c5c7f15f 100644
+index cce8cad71b9f620a3d26946a7df937a1336d741e..ea5db4e66f1cbbb2728558091dc07a413a536e1f 100644
 --- a/chrome/browser/speech/tts_controller_delegate_impl.cc
 +++ b/chrome/browser/speech/tts_controller_delegate_impl.cc
 @@ -213,6 +213,7 @@ void TtsControllerDelegateImpl::UpdateUtteranceDefaultsFromPrefs(
@@ -29,145 +29,3 @@ index e96b0cef21bec8925d4adf1e8692dc00f5ec6f5f..7ec07534aa3628873c9fe784fa0235f3
    return prefs;
  }
  
-diff --git a/chrome/browser/speech/tts_message_filter.cc b/chrome/browser/speech/tts_message_filter.cc
-index cf0841622b99ad6637314284bcdbd83060a404cc..779b51992c180a76ed8a2c492297416aa557d214 100644
---- a/chrome/browser/speech/tts_message_filter.cc
-+++ b/chrome/browser/speech/tts_message_filter.cc
-@@ -10,8 +10,11 @@
- #include "base/logging.h"
- #include "base/task/post_task.h"
- #include "chrome/browser/chrome_notification_types.h"
-+#if 0
- #include "chrome/browser/profiles/profile.h"
-+#endif
- #include "chrome/common/tts_messages.h"
-+#include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
- #include "content/public/browser/browser_context.h"
- #include "content/public/browser/browser_task_traits.h"
- #include "content/public/browser/notification_service.h"
-@@ -19,6 +22,29 @@
- 
- using content::BrowserThread;
- 
-+namespace {
-+
-+class TtsMessageFilterShutdownNotifierFactory
-+    : public BrowserContextKeyedServiceShutdownNotifierFactory {
-+ public:
-+  static TtsMessageFilterShutdownNotifierFactory* GetInstance() {
-+    return base::Singleton<TtsMessageFilterShutdownNotifierFactory>::get();
-+  }
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<
-+      TtsMessageFilterShutdownNotifierFactory>;
-+
-+  TtsMessageFilterShutdownNotifierFactory()
-+      : BrowserContextKeyedServiceShutdownNotifierFactory("TtsMessageFilter") {}
-+
-+  ~TtsMessageFilterShutdownNotifierFactory() override {}
-+
-+  DISALLOW_COPY_AND_ASSIGN(TtsMessageFilterShutdownNotifierFactory);
-+};
-+
-+}  // namespace
-+
- TtsMessageFilter::TtsMessageFilter(content::BrowserContext* browser_context)
-     : BrowserMessageFilter(TtsMsgStart),
-       browser_context_(browser_context),
-@@ -26,28 +52,27 @@ TtsMessageFilter::TtsMessageFilter(content::BrowserContext* browser_context)
-   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-   content::TtsController::GetInstance()->AddVoicesChangedDelegate(this);
- 
--  // TODO(dmazzoni): make it so that we can listen for a BrowserContext
--  // being destroyed rather than a Profile.  http://crbug.com/444668
--  Profile* profile = Profile::FromBrowserContext(browser_context);
--  notification_registrar_.Add(this,
--                              chrome::NOTIFICATION_PROFILE_DESTROYED,
--                              content::Source<Profile>(profile));
-+  browser_context_shutdown_notifier_ =
-+      TtsMessageFilterShutdownNotifierFactory::GetInstance()
-+          ->Get(browser_context)
-+          ->Subscribe(base::Bind(&TtsMessageFilter::BrowserContextDestroyed,
-+                                 base::RetainedRef(this)));
- 
-   // Balanced in OnChannelClosingInUIThread() to keep the ref-count be non-zero
-   // until all pointers to this class are invalidated.
-   AddRef();
- }
- 
--void TtsMessageFilter::OverrideThreadForMessage(
--    const IPC::Message& message, BrowserThread::ID* thread) {
-+void TtsMessageFilter::OverrideThreadForMessage(const IPC::Message& message,
-+                                                BrowserThread::ID* thread) {
-   switch (message.type()) {
--  case TtsHostMsg_InitializeVoiceList::ID:
--  case TtsHostMsg_Speak::ID:
--  case TtsHostMsg_Pause::ID:
--  case TtsHostMsg_Resume::ID:
--  case TtsHostMsg_Cancel::ID:
--    *thread = BrowserThread::UI;
--    break;
-+    case TtsHostMsg_InitializeVoiceList::ID:
-+    case TtsHostMsg_Speak::ID:
-+    case TtsHostMsg_Pause::ID:
-+    case TtsHostMsg_Resume::ID:
-+    case TtsHostMsg_Cancel::ID:
-+      *thread = BrowserThread::UI;
-+      break;
-   }
- }
- 
-@@ -211,10 +236,8 @@ void TtsMessageFilter::Cleanup() {
-   content::TtsController::GetInstance()->RemoveUtteranceEventDelegate(this);
- }
- 
--void TtsMessageFilter::Observe(
--    int type,
--    const content::NotificationSource& source,
--    const content::NotificationDetails& details) {
-+void TtsMessageFilter::BrowserContextDestroyed() {
-+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-   browser_context_ = nullptr;
--  notification_registrar_.RemoveAll();
-+  browser_context_shutdown_notifier_.reset();
- }
-diff --git a/chrome/browser/speech/tts_message_filter.h b/chrome/browser/speech/tts_message_filter.h
-index ffb607fbb275b0a75dba592f2f5f5afb881214e2..99780e56674af749a231f0e85b89e6a6ed3743d6 100644
---- a/chrome/browser/speech/tts_message_filter.h
-+++ b/chrome/browser/speech/tts_message_filter.h
-@@ -8,6 +8,7 @@
- #include "base/macros.h"
- #include "base/memory/weak_ptr.h"
- #include "base/synchronization/lock.h"
-+#include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
- #include "content/public/browser/browser_message_filter.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/notification_observer.h"
-@@ -21,7 +22,6 @@ class BrowserContext;
- struct TtsUtteranceRequest;
- 
- class TtsMessageFilter : public content::BrowserMessageFilter,
--                         public content::NotificationObserver,
-                          public content::UtteranceEventDelegate,
-                          public content::VoicesChangedDelegate {
-  public:
-@@ -64,15 +64,13 @@ class TtsMessageFilter : public content::BrowserMessageFilter,
-   // about to be deleted.
-   bool Valid();
- 
--  // content::NotificationObserver implementation.
--  void Observe(int type,
--               const content::NotificationSource& source,
--               const content::NotificationDetails& details) override;
-+  void BrowserContextDestroyed();
- 
-+  std::unique_ptr<KeyedServiceShutdownNotifier::Subscription>
-+      browser_context_shutdown_notifier_;
-   content::BrowserContext* browser_context_;
-   mutable base::Lock mutex_;
-   mutable bool valid_;
--  content::NotificationRegistrar notification_registrar_;
- 
-   DISALLOW_COPY_AND_ASSIGN(TtsMessageFilter);
- };