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

ui/aura/test/aura_test_base.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 "ui/aura/test/aura_test_base.h"
 
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
@@ skipping 214 matching lines @@
 }
 
 void AuraTestBase::OnWmPerformMoveLoop(
     Window* window,
     ui::mojom::MoveLoopSource source,
     const gfx::Point& cursor_location,
     const base::Callback<void(bool)>& on_done) {}
 
 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {}
 
+client::FocusClient* AuraTestBase::GetFocusClient() {
+  return helper_->focus_client();
+}
+
 client::CaptureClient* AuraTestBase::GetCaptureClient() {
   return helper_->capture_client();
 }
 
 PropertyConverter* AuraTestBase::GetPropertyConverter() {
   return property_converter_.get();
 }
 
 AuraTestBaseWithType::AuraTestBaseWithType() {}
 
 AuraTestBaseWithType::~AuraTestBaseWithType() {
   DCHECK(setup_called_);
 }
 
 void AuraTestBaseWithType::SetUp() {
   DCHECK(!setup_called_);
   setup_called_ = true;
   ConfigureBackend(GetParam());
   AuraTestBase::SetUp();
 }
 
 }  // namespace test
 }  // namespace aura