Revert of Converts chrome to aura-mus

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.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 "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h"
 #include "components/constrained_window/constrained_window_views.h"
 
 #if defined(USE_AURA)
 #include "base/run_loop.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/ui/public/cpp/gpu/gpu.h"
 #include "services/ui/public/cpp/input_devices/input_device_client.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"
 #include "ui/display/screen.h"
-#include "ui/views/mus/mus_client.h"
+#include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/wm/core/wm_state.h"
 #endif  // defined(USE_AURA)
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 72 matching lines @@
     base::RunLoop wait_loop;
     connection->SetInitializeHandler(wait_loop.QuitClosure());
     wait_loop.Run();
 
     input_device_client_.reset(new ui::InputDeviceClient());
     ui::mojom::InputDeviceServerPtr server;
     connection->GetConnector()->ConnectToInterface(ui::mojom::kServiceName,
                                                    &server);
     input_device_client_->Connect(std::move(server));
 
-    // WMState is owned as a member, so don't have MusClient create it.
-    const bool create_wm_state = false;
-    mus_client_ = base::MakeUnique<views::MusClient>(
+    window_manager_connection_ = views::WindowManagerConnection::Create(
         connection->GetConnector(), connection->GetIdentity(),
         content::BrowserThread::GetTaskRunnerForThread(
-            content::BrowserThread::IO),
-        create_wm_state);
+            content::BrowserThread::IO));
   }
 #endif  // defined(USE_AURA)
 }