Revert of Converts chrome to aura-mus

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 260 matching lines @@
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
 #endif
 
 #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)
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 #endif
 
 #if defined(USE_X11)
 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
 #endif
 
@@ skipping 615 matching lines @@
 #endif
 
   chrome::AddProfilesExtraParts(main_parts);
 
   // Construct additional browser parts. Stages are called in the order in
   // which they are added.
 #if defined(TOOLKIT_VIEWS)
 #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);
-#if defined(USE_ASH)
-  main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh(extra_parts_views));
-#endif
+  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());
+#endif
+
 #if defined(USE_X11)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsX11());
 #endif
 
 #if defined(ENABLE_WAYLAND_SERVER)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsExo());
 #endif
 
   chrome::AddMetricsExtraParts(main_parts);
 
@@ skipping 1793 matching lines @@
     }
     ++iter;
   }
 #endif
   return NULL;
 }
 
 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;
 }
 
 bool ChromeContentBrowserClient::AllowPepperSocketAPI(
     content::BrowserContext* browser_context,
     const GURL& url,
     bool private_api,
     const content::SocketPermissionRequest* params) {
 #if BUILDFLAG(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS)
@@ skipping 613 matching lines @@
   *index_to_traits_callback = base::Bind(&task_scheduler_util::initialization::
                                              BrowserWorkerPoolIndexForTraits);
 }
 
 void ChromeContentBrowserClient::
     PerformExperimentalTaskSchedulerRedirections() {
   task_scheduler_util::variations::
       MaybePerformBrowserTaskSchedulerRedirection();
 }
 
-// static
+//static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }