1 files changed, 24 insertions, 11 deletions

diff --git a/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc b/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
index 02d77771c79..7e58654da56 100644
--- a/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
+++ b/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
@@ -21,10 +21,13 @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/url_constants.h"
 #include "components/user_manager/user_manager.h"
+#include "content/public/common/service_manager_connection.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/api/virtual_keyboard.h"
 #include "extensions/common/api/virtual_keyboard_private.h"
 #include "media/audio/audio_system.h"
+#include "services/audio/public/cpp/audio_system_factory.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
@@ -74,7 +77,10 @@ void ChromeVirtualKeyboardDelegate::GetKeyboardConfig(
     OnKeyboardSettingsCallback on_settings_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!audio_system_)
-    audio_system_ = media::AudioSystem::CreateInstance();
+    audio_system_ = audio::CreateAudioSystem(
+        content::ServiceManagerConnection::GetForProcess()
+            ->GetConnector()
+            ->Clone());
   audio_system_->HasInputDevices(
       base::BindOnce(&ChromeVirtualKeyboardDelegate::OnHasInputDevices,
                      weak_this_, std::move(on_settings_callback)));
@@ -152,24 +158,31 @@ bool ChromeVirtualKeyboardDelegate::ShowLanguageSettings() {
   return true;
 }
 
-bool ChromeVirtualKeyboardDelegate::SetVirtualKeyboardMode(int mode_enum) {
+bool ChromeVirtualKeyboardDelegate::SetVirtualKeyboardMode(
+    int mode_enum,
+    OnSetModeCallback on_set_mode_callback) {
   keyboard::KeyboardController* controller =
       keyboard::KeyboardController::GetInstance();
   if (!controller)
     return false;
 
-  switch (mode_enum) {
+  controller->SetContainerType(ConvertKeyboardModeToContainerType(mode_enum),
+                               std::move(on_set_mode_callback));
+  return true;
+}
+
+keyboard::ContainerType
+ChromeVirtualKeyboardDelegate::ConvertKeyboardModeToContainerType(
+    int mode) const {
+  switch (mode) {
     case keyboard_api::KEYBOARD_MODE_FULL_WIDTH:
-      controller->SetContainerType(keyboard::ContainerType::FULL_WIDTH);
-      break;
+      return keyboard::ContainerType::FULL_WIDTH;
     case keyboard_api::KEYBOARD_MODE_FLOATING:
-      controller->SetContainerType(keyboard::ContainerType::FLOATING);
-      break;
-    default:
-      NOTREACHED();
-      break;
+      return keyboard::ContainerType::FLOATING;
   }
-  return true;
+
+  NOTREACHED();
+  return keyboard::ContainerType::FULL_WIDTH;
 }
 
 bool ChromeVirtualKeyboardDelegate::SetDraggableArea(