Reland: chromeos: Convert ash VPNDelegate interface to mojo

chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 12 matching lines @@
 #include "content/public/common/service_manager_connection.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/interfaces/ime.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/keyboard/content/keyboard.h"
 #include "ui/keyboard/keyboard_controller.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/ash/system_tray_client.h"
+#include "chrome/browser/ui/ash/vpn_list_forwarder.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace {
 
 void RegisterIMEDriver() {
   // Instantiate the IME driver and register it to the UI service.
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ui::mojom::IMEDriverPtr ime_driver_ptr;
@@ skipping 21 matching lines @@
     immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
     // IME driver must be available at login screen, so initialize before
     // profile.
     RegisterIMEDriver();
   }
 
 #if defined(OS_CHROMEOS)
   // Must be available at login screen, so initialize before profile.
   system_tray_client_ = base::MakeUnique<SystemTrayClient>();
 
+  vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>();
+
   // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
   // initialized. Otherwise, virtual keyboard extension will not load at login
   // screen.
   keyboard::InitializeKeyboard();
 
   ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
 #endif  // defined(OS_CHROMEOS)
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
@@ skipping 11 matching lines @@
   // Initialize TabScrubber after the Ash Shell has been initialized.
   TabScrubber::GetInstance();
   // Activate virtual keyboard after profile is initialized. It depends on the
   // default profile.
   ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
       keyboard::KeyboardController::GetInstance());
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
 #if defined(OS_CHROMEOS)
+  vpn_list_forwarder_.reset();
   system_tray_client_.reset();
 #endif
   chrome::CloseAsh();
 }