Removes code using mus client lib

ui/views/focus/focus_manager_unittest.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/views/focus/focus_manager.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 107 matching lines @@
 
   GetFocusManager()->ClearFocus();
   ASSERT_EQ(1, static_cast<int>(listener.focus_changes().size()));
   EXPECT_TRUE(listener.focus_changes()[0] == ViewPair(view2, null_view));
 }
 
 TEST_F(FocusManagerTest, WidgetFocusChangeListener) {
   // TODO: this test ends up calling focus on the aura::Window associated with
   // the Widget and expecting that to change activation. This should work for
   // aura-mus-client as well. http://crbug.com/664261.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   // First, ensure the simulator is aware of the Widget created in SetUp() being
   // currently active.
   test::WidgetTest::SimulateNativeActivate(GetWidget());
 
   TestWidgetFocusChangeListener widget_listener;
   AddWidgetFocusChangeListener(&widget_listener);
 
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
@@ skipping 710 matching lines @@
   Widget* widget_;
   bool should_advance_focus_to_parent_;
 
   DISALLOW_COPY_AND_ASSIGN(AdvanceFocusWidgetDelegate);
 };
 
 }  // namespace
 
 // Verifies focus wrapping happens in the same widget.
 TEST_F(FocusManagerTest, AdvanceFocusStaysInWidget) {
-  // Mus doesn't support child Widgets well yet. https://crbug.com/612820
-  if (IsMus())
-    return;
   // Add |widget_view| as a child of the Widget.
   View* widget_view = new View;
   widget_view->SetFocusBehavior(View::FocusBehavior::ALWAYS);
   widget_view->SetBounds(20, 0, 20, 20);
   GetContentsView()->AddChildView(widget_view);
 
   // Create a widget with two views, focus the second.
   std::unique_ptr<AdvanceFocusWidgetDelegate> delegate;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 29 matching lines @@
   EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
 
   // Allow focus to go to the parent, and focus backwards which should now move
   // up |widget_view| (in the parent).
   delegate->set_should_advance_focus_to_parent(true);
   GetFocusManager()->AdvanceFocus(true);
   EXPECT_EQ(widget_view, GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views