Revert of Converts chrome to aura-mus

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 5c02f167b36f3a37cbcd6d6a3ccd191e7642a1af..83f63ce3010d37aee1e3ccb4a461ceca194fabbd 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -20,7 +20,7 @@
 #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)
@@ -113,13 +113,10 @@
                                                    &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)
 }