chromeos: removes some dead code

MASH_DEPRECATED is never set anymore.

BUG=692193
TEST=none

Change-Id: I49a99e9e3c6bbc7f3c77238e450e18c4ffd6b992
Reviewed-on: https://chromium-review.googlesource.com/1176102Reviewed-by: Dan Erat <derat@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583307}

ash/system/power/power_event_observer.cc

@@ -7,7 +7,6 @@
 #include <map>
 #include <utility>
 
-#include "ash/public/cpp/config.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
@@ -283,10 +282,7 @@ void PowerEventObserver::SuspendImminent(
 void PowerEventObserver::SuspendDone(const base::TimeDelta& sleep_duration) {
   suspend_in_progress_ = false;
 
-  // TODO(derat): After mus exposes a method for resuming displays, call it
-  // here: http://crbug.com/692193
-  if (Shell::GetAshConfig() != Config::MASH_DEPRECATED)
-    Shell::Get()->display_configurator()->ResumeDisplays();
+  Shell::Get()->display_configurator()->ResumeDisplays();
   Shell::Get()->system_tray_model()->clock()->NotifyRefreshClock();
 
   // If the suspend request was being blocked while waiting for the lock
@@ -348,15 +344,9 @@ void PowerEventObserver::StopCompositingAndSuspendDisplays() {
 
   ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
 
-  // TODO(derat): After mus exposes a method for suspending displays, call it
-  // here: http://crbug.com/692193
-  if (Shell::GetAshConfig() != Config::MASH_DEPRECATED) {
-    Shell::Get()->display_configurator()->SuspendDisplays(
-        base::Bind(&OnSuspendDisplaysCompleted,
-                   base::Passed(&displays_suspended_callback_)));
-  } else {
-    std::move(displays_suspended_callback_).Run();
-  }
+  Shell::Get()->display_configurator()->SuspendDisplays(
+      base::Bind(&OnSuspendDisplaysCompleted,
+                 base::Passed(&displays_suspended_callback_)));
 }
 
 void PowerEventObserver::EndPendingWallpaperAnimations() {