Revert: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient()

services/ui/test_wm/test_wm.cc

 // 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.
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ skipping 69 matching lines @@
   void OnEmbedRootDestroyed(
       aura::WindowTreeHostMus* window_tree_host) override {
     // WindowTreeClients configured as the window manager should never get
     // OnEmbedRootDestroyed().
     NOTREACHED();
   }
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               aura::Window* target) override {
     // Don't care.
   }
+  aura::client::CaptureClient* GetCaptureClient() override {
+    return wm_state_.capture_controller();
+  }
   aura::PropertyConverter* GetPropertyConverter() override {
     return &property_converter_;
   }
 
   // aura::WindowManagerDelegate:
   void SetWindowManagerClient(aura::WindowManagerClient* client) override {
     window_manager_client_ = client;
   }
   bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override {
     return true;
@@ skipping 81 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWM);
 };
 
 }  // namespace test
 }  // namespace ui
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new ui::test::TestWM);
   return runner.Run(service_request_handle);
 }