Revert of chromeos: Convert ash VPNDelegate interface to mojo

ash/common/wm_shell.h

 // Copyright 2016 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.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 75 matching lines @@
 class NewWindowClient;
 }
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
 
 #if defined(OS_CHROMEOS)
 class LogoutConfirmationController;
-class VpnList;
 #endif
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
@@ skipping 312 matching lines @@
 
   const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
     return blocking_pool_;
   }
 
 #if defined(OS_CHROMEOS)
   LogoutConfirmationController* logout_confirmation_controller() {
     return logout_confirmation_controller_.get();
   }
 
-  VpnList* vpn_list() { return vpn_list_.get(); }
-
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 
   // Enable or disable the laser pointer.
   virtual void SetLaserPointerEnabled(bool enabled) = 0;
 #endif
 
  protected:
   explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate);
   virtual ~WmShell();
@@ skipping 68 matching lines @@
   // See comment for GetRootWindowForNewWindows().
   WmWindow* root_window_for_new_windows_ = nullptr;
   WmWindow* scoped_root_window_for_new_windows_ = nullptr;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
-  std::unique_ptr<VpnList> vpn_list_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_