Reland of 'Move content/browser/power_save_blocker to //device/power_save_blocker'

content/browser/BUILD.gn

Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 91fce04f3417b2a17c484a64fd2e6d41bde699cd..f5c39064215822556d7618b595addc4343bc2186 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -57,6 +57,7 @@ source_set("browser") {
     "//crypto",
     "//device/battery",
     "//device/bluetooth",
+    "//device/power_save_blocker",
     "//device/vibration",
     "//gin",
     "//google_apis",
@@ -291,22 +292,9 @@ source_set("browser") {
 
   if (use_x11) {
     configs += [ "//build/config/linux:x11" ]
-    if (!is_chromeos) {
-      configs += [ "//build/config/linux:xscrnsaver" ]
-    }
     deps += [ "//ui/gfx/x" ]
   }
 
-  # Dealing with power_save_blocker_{x11,ozone}.cc is a little complicated
-  # given the interaction between os_chromeos and the feature flags for X11 and
-  # ozone, so do it all in one spot.
-  if (is_chromeos || !use_ozone) {
-    sources -= [ "power_save_blocker_ozone.cc" ]
-  }
-  if (is_chromeos || !use_x11) {
-    sources -= [ "power_save_blocker_x11.cc" ]
-  }
-
   # Dealing with *wifi_data_provider_*.cc is also a bit complicated given
   # android, chromeos, linux and use_dbus.
   if (is_android) {