Revert of chromeos: Makes mushrome use simplified display management

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index a9cf2aeaef37ed3b771e22dbc330cae4132d2dc4..87eafaca02864b1b556f87c807bb133995a9c5f0 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -254,9 +254,7 @@
     }
     service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
     service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
-    // TODO(sky): once mash supports simplified display mode we should always
-    // use ChromeConsoleServiceProviderDelegate.
-    if (GetAshConfig() != ash::Config::MASH) {
+    if (GetAshConfig() == ash::Config::CLASSIC) {
       service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
           base::MakeUnique<ChromeConsoleServiceProviderDelegate>()));
     } else {