chromeos: fix focus for mushrome

ui/aura/test/mus/test_window_tree_client_setup.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 "ui/aura/test/mus/test_window_tree_client_setup.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/mus/window_tree_client.h"
+#include "ui/aura/test/mus/test_window_manager_client.h"
 #include "ui/aura/test/mus/test_window_tree.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/display/display.h"
 
 namespace aura {
 
 TestWindowTreeClientSetup::TestWindowTreeClientSetup() {}
 
 TestWindowTreeClientSetup::~TestWindowTreeClientSetup() {}
 
 void TestWindowTreeClientSetup::Init(
     WindowTreeClientDelegate* window_tree_delegate) {
   CommonInit(window_tree_delegate, nullptr);
   WindowTreeClientPrivate(window_tree_client_.get())
       .OnEmbed(window_tree_.get());
 }
 
 void TestWindowTreeClientSetup::InitForWindowManager(
     WindowTreeClientDelegate* window_tree_delegate,
     WindowManagerDelegate* window_manager_delegate) {
+  test_window_manager_client_ = base::MakeUnique<TestWindowManagerClient>();
   CommonInit(window_tree_delegate, window_manager_delegate);
-  WindowTreeClientPrivate(window_tree_client_.get())
-      .SetTreeAndClientId(window_tree_.get(), 1);
+  WindowTreeClientPrivate wtc_private(window_tree_client_.get());

[msw, 2017/04/26 23:01:09]

optional nit: avoid acronyms

[sky, 2017/04/26 23:30:28]

Ya, I thought the name was rather long and went with the acronym. But you're
right, we typically don't do that.

+  wtc_private.SetTreeAndClientId(window_tree_.get(), 1);
+  wtc_private.SetWindowManagerClient(test_window_manager_client_.get());
 }
 
 std::unique_ptr<WindowTreeClient>
 TestWindowTreeClientSetup::OwnWindowTreeClient() {
   DCHECK(window_tree_client_);
   return std::move(window_tree_client_);
 }
 
 WindowTreeClient* TestWindowTreeClientSetup::window_tree_client() {
   return window_tree_client_.get();
 }
 
 void TestWindowTreeClientSetup::CommonInit(
     WindowTreeClientDelegate* window_tree_delegate,
     WindowManagerDelegate* window_manager_delegate) {
   window_tree_.reset(new TestWindowTree);
   window_tree_client_ = base::MakeUnique<WindowTreeClient>(
       nullptr, window_tree_delegate, window_manager_delegate);
   window_tree_->set_client(window_tree_client_.get());
 }
 
 }  // namespace aura