Reland of Improves focus/activation for aura-mus and DesktopNativeWidgetAura

ui/aura/test/aura_test_base.h

 // 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.
 
 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
 #define UI_AURA_TEST_AURA_TEST_BASE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 98 matching lines @@
                       const display::Display& display) override;
   void OnWmDisplayRemoved(Window* window) override;
   void OnWmDisplayModified(const display::Display& display) override;
   ui::mojom::EventResult OnAccelerator(uint32_t id,
                                        const ui::Event& event) override;
   void OnWmPerformMoveLoop(Window* window,
                            ui::mojom::MoveLoopSource source,
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override;
   void OnWmCancelMoveLoop(Window* window) override;
-  client::FocusClient* GetFocusClient() override;
   client::CaptureClient* GetCaptureClient() override;
   PropertyConverter* GetPropertyConverter() override;
 
  private:
   // Only used for mus. Both are are initialized to this, but may be reset.
   WindowManagerDelegate* window_manager_delegate_;
   WindowTreeClientDelegate* window_tree_client_delegate_;
 
   bool use_mus_ = false;
   bool setup_called_ = false;
@@ skipping 18 matching lines @@
  private:
   bool setup_called_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_AURA_TEST_BASE_H_