Revert of Converts chrome to aura-mus

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index a3fbed657f7eaff10c7612c2c40f4f684d304aa3..66f12903b04a0ca3999d135d919853b2882f03a1 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -278,7 +278,7 @@
 #if defined(USE_AURA)
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/ui/public/cpp/gpu/gpu.h"
-#include "ui/views/mus/mus_client.h"
+#include "ui/views/mus/window_manager_connection.h"
 #endif
 
 #if defined(USE_ASH)
@@ -914,13 +914,14 @@
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
 #else
-  ChromeBrowserMainExtraPartsViews* extra_parts_views =
-      new ChromeBrowserMainExtraPartsViews;
-  main_parts->AddParts(extra_parts_views);
+  main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
+#endif
+#endif
+
+// TODO(oshima): Athena on chrome currently requires USE_ASH to build.
+// We should reduce the dependency as much as possible.
 #if defined(USE_ASH)
-  main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh(extra_parts_views));
-#endif
-#endif
+  main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
 #endif
 
 #if defined(USE_X11)
@@ -2736,8 +2737,8 @@
 gpu::GpuChannelEstablishFactory*
 ChromeContentBrowserClient::GetGpuChannelEstablishFactory() {
 #if defined(USE_AURA)
-  if (views::MusClient::Exists())
-    return views::MusClient::Get()->gpu();
+  if (views::WindowManagerConnection::Exists())
+    return views::WindowManagerConnection::Get()->gpu();
 #endif
   return nullptr;
 }
@@ -3371,7 +3372,7 @@
       MaybePerformBrowserTaskSchedulerRedirection();
 }
 
-// static
+//static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;