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

components/drive/DEPS

Index: components/drive/DEPS
diff --git a/components/drive/DEPS b/components/drive/DEPS
index 5586c3bf40fb39961fc85a0485b714ea42c191f5..dda68d0e8b98eb9c36c9031052bdc0cf7376240e 100644
--- a/components/drive/DEPS
+++ b/components/drive/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+components/invalidation",
   "+components/keyed_service",
   "+components/prefs",
+  "+device/power_save_blocker",
   "+google_apis",
   "+google/cacheinvalidation/types.pb.h",
   "+net",
@@ -10,13 +11,6 @@ include_rules = [
 ]
 
 specific_include_rules = {
-  # The following dependency should be removed to fully make this
-  # directory chrome/ and content/ and storage/ independent.
-  # crbug.com/257943
-  "drive_uploader\.cc": [
-    "+content/public/browser/power_save_blocker_factory.h",
-  ],
-
   # The following test dependencies should be removed to fully componentize this
   # directory. crbug.com/498951
   r"(copy_operation_unittest\.cc"
@@ -62,8 +56,9 @@ specific_include_rules = {
 
   # The following test dependencies should be removed to fully componentize this
   # directory. crbug.com/498951
-  r"(fake_file_system\.cc"
-  r"|file_system_unittest.cc"
+  r"(drive_uploader\.cc"
+  r"|fake_file_system\.cc"
+  r"|file_system_unittest\.cc"
   r"|file_write_watcher_unittest\.cc"
   r"|get_file_for_saving_operation_unittest\.cc"
   r"|operation_test_base\.cc"